Merge pull request #1 from Ichimonji10/master

update .gitignore, rewrite docs
Merge branch 'master' into docs

Merge branch in preparation for issuing a pull request. Branch 'docs' should be
in sync with 'pchapin/master' for the best chance of a clean pull request.