updating master with docs from gh-pages
updating gitignore and adding README.rst
slightly self-descriptive now
fixing merge conflict in index.rst
rebuilding docs