merge conflict fixes
removing built docs
ignore OSX funny files
Merge pull request #2 from praekelt/feature/issue-2-fix-sphinx-docs

fix sphinx docs.