start updating docs
Merge branch 'master' of github.com:swryan/nreltraining2013

FIXED Conflicts:
	docs/conf.py
	docs/srcdocs.rst
update docs