Added some new alias's to the bashrc
Merge branch 'master' of github.com:blsmit5728/dotfiles

Conflicts:
	bashrc