PS1 for ackbar
Merge branch 'master' of github.com:fnl/vimrc

Conflicts:
	bashrc