attempt to fix setup.py
working on docs more
Merge branch 'master' of https://github.com/JustinSGray/nreltraining2013