Start moving machine-specific configuration into .bash_machines.
Create .bash_functions/path_utils to simplify path adding.
Move the machine-specific declare_path calls into .bash_machines files.