Change colorscheme
Update .zshrc
Update vim
Add emacs24 config files
Update
Add Vagrantfile
Update vim files
Merge remote-tracking branch 'origin/master'