vim, bash updates
Merge remote-tracking branch 'origin/master'
Add clang-format, update gitconfig and vimrc
Merge remote-tracking branch 'origin/master'

Conflicts:
	astylerc
	gitconfig
	gitignore