cleaned .bashrc and moved bits into general