Make sure /usr/local/bin is ahead of /usr/bin.
Add Amazon EC2 to path.
Merge branch 'master' of github.com:rolme/dotfiles

Conflicts:
	oh-my-zsh/zshrc.symlink