Fixed stuff
Merge branch 'master' of github.com:cnv1989/dotfiles-nag

Conflicts:
	.bash_profile