better sourcing of optional files
Move bash functions to separate file
More readable
Improved script
Merge branch 'master' of github.com:JimGaylard/dotfiles

Conflicts:
	bashrc