Merge remote-tracking branch 'fitztrev/master'

Author: Matt Turner

Shuttle/AppDelegate.m

@@ -158,7 +158,11 @@ - (NSDictionary*) parseSSHConfigFile {
 
         if ([first isEqualToString:@"Host"]) {
             // a new host section
-            key = second;
+            
+            // split multiple aliases on space and only save the first
+            NSArray* hostAliases = [second componentsSeparatedByCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
+            hostAliases = [hostAliases filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"SELF != ''"]];
+            key = [hostAliases firstObject];
             servers[key] = [[NSMutableDictionary alloc] init];
         }
     }

Shuttle/apple-scpt/iTerm-stable-new-tab-default.scpt

@@ -16,7 +16,13 @@ end scriptRun
 on CommandRun(withCmd, withTheme, theTitle)
 	tell application "iTerm"
 		if it is running then
-			tell the current terminal
+			set curTerm to (current terminal)
+			try
+				set tmp to curTerm
+			on error
+				set curTerm to (make new terminal)
+			end try
+			tell curTerm
 				set newSession to (launch session withTheme)
 				tell the last session
 					reopen
@@ -41,4 +47,4 @@ on CommandRun(withCmd, withTheme, theTitle)
 			end tell
 		end if
 	end tell
-end CommandRun
+end CommandRun