Include MAMP's PHP in the path
Merge branch 'master' of github.com:josephscott/shell-setup
vim: highlight whitespace
vim: turn on syntax highlighting for Nginx conf files