Stop aliasing make to 'make -w'

Changing vimrc is already enough.
Change the style of cmake files

Set tab stop to 2