Update vimrc: change make mappings to cmake mappings
Update vimrc: change colorscheme to 'solarized' and background to 'light'
Merge branch 'dev' into personal