updated tmux.conf and bashrc, added laptop make.conf
added 3.10.7 conf for laptop
changed prompt in bash for user