Trying to fix UpArrow to search history correctly
Added home/local path and fl alias.
Merge branch 'master' into woodfin

Conflicts:
	.bashrc.tobit