Add .bash_aliases file. This should be clarified probably.
Merge branch 'master' of git://github.com/mattfelten/dotfiles

Conflicts:
	bashrc.symlink