Source '.bash_aliases' and '.bash_functions' instead of the '.personal'
equivalents; this ensures that the first file in the glob list of
function and alias scripts is the "personal" one, which is really the
primary one. This makes the aliases for editing these scripts more
natural, since the workaround would be something like 'edit
~/.bash_[whatever].personal ~/.bash_[whatever].!(personal)', which
I don't even think would work in older versions of bash.
minor changes
Merge branch 'master' of https://github.com/BatmanAoD/public-config

Conflicts:
	bashrc