Add some stuff from Ben Frain
https://gist.githubusercontent.com/benfrain/f09dd39e66fe2da9cf0a/raw/525d5c8a3249c9a128384d51699369d81ca977c6/.vimrc