Remove unused aliases and cleanup order

This is just some general cleaning.
Merge branch 'master' of github.com:z3usy/dotfiles

* 'master' of github.com:z3usy/dotfiles:
  Add .bash_profile and update aliases

Conflicts:
	.bashrc