Swapped Sublime Text for vim
Updated README
Cleaned up .vimrc
Added push.default=simple to .gitconfig
Merged github branch