Major reorg of bash profile. Also just cram everything into bashrc until I can sort it out.