New stuff
Merge branch 'google'

Conflicts:
	bash_custom_google
	vim_custom_google
Merge branch 'master' of https://github.com/pikma/Config