Source EC2 env only if on OS X
iTerm2: added configuration
vim: ignore history
Merge master into mac