moved conf.py to its right place
cleaned up the cmake for building the docs nicer
Merge pull request #477 from naxuroqa/master

moved conf.py to its right place
Passed everything through astyle.