multiple updates:

- remove ssh keys
- use cleaner PS1 function for git branch
- add cmake vim syntax highlighting
Merge branch 'master' of https://github.com/tbonfort/dotfiles

Conflicts:
	repo/.bashrc