started afresh with python settings on windows, split python setups into os-conditional since linux seems to work better
Merge branch 'master' of github.com:jtecca/work-emacs
remove a comment, get rid of elpy setting since it is gone.  will need to re-incorporate linux setup