Included some tweaks from Damian Conways's vimrc