Better quitting mechanism for vim with multiple tabs. Saparation of rm.xml for lab and laptop.
Merge remote-tracking branch 'origin/master'
Changes reflected in lab to match laptop.