adding xsession
adding python and vagrant specific stuff to my global gitignore
Merge remote-tracking branch 'origin/master'