Move all settings into single vimrc; Source vimrc from .vimrc

* Easier to see duplicated / conflicting setttings
* In line with what a lot of smarter people are doing probably because
  of above