Refactor of .bash layout.

This hopefully will make managing site-specific additions easier.