Change of colorscheme, removed startofline as default, removed trailing spaces
Merge commit 'HEAD@{2}'

Conflicts:
	vim/bundle/syntastic
	vim/bundle/tcomment_vim
	vim/bundle/vim-airline
	vimrc