Remove smartindent from default settings.

(This prevents issues with indenting lines that start with "#")
Merged origin/master
More changes to vimrc