Added iTerm 2 preferences, and also some vim thing
Merge branch 'master' of github.com:kylehughes/system