Merging changes
Merge branch 'master' of https://github.com/dvhthomas/dotfiles
* adding syntastic
* stopping rope-based python work