Changed check in setup.py to syntax in core package to avoid issues when Sphinx is not installed.
Update setup.py to reflect re-factored setup code for 0.2 release
If necessary, move configuration file to the right place on first import
Merge pull request #50 from astrofrog/update-from-template-2

Update from package template