removed smartindent (which does not play well with filetype indent)
Merge branch 'master' of http://github.com/andelinben/vim-stuffs

Conflicts:
	.vimrc