remove xsession for mac
Merge branch 'mac' of github.com:kmulvey/dotfiles into mac
resolve conflict