Remove tagbar
Add clang-complete mappings to vimrc
Merge branch 'master' into laptop

Conflicts:
	vimrc
Foo
Merge branch 'master' into laptop