lil' bashrc reorg and cleaned up some git aliases