Merge in my own atom config
Remove file that shouldn't have been in git
Add Sublime Package Control to gitignore
Update atom config
Improve Sublime carat settings
Add some basic settings to vimrc
Merge master into dev-vm