Move shell functions to separate file

This makes it easier for others to source the same file without getting
my other environment settings.
Merge branch 'master' of github.com:rkennedy/dotfiles

Conflicts:
	bashrc