Foo
Bar
Add alternate

Conflicts:
	vim/bundle/tagbar
Remove clang_complete and supertab
Add YCM
Restore astyle mapping
YCM mappings
Merge remote-tracking branch 'origin/master' into laptop

Conflicts:
	i3/config
	vim/bundle/tagbar
Add snippets
Merge remote-tracking branch 'origin/master' into laptop