Added vim as default editor
Merge branch 'master' of github.com:KSDaemon/bash_profile

Conflicts:
	bash_profile