made my terminal like vim, added alias to pixel server
Merge branch 'master' of github.com:ryanatk/setup
dotfile updates
Merge remote-tracking branch 'origin/master'