Updated the vimrc and README files to reflect my latest setup.
Merge branch 'master' of personal-github:0xFM/.vimrc
Result with the latest merge with origin-master.