Removed the last traces of the submodule.

Undoes two commits that added & changed the .gitignore to try to support the submodule.
This commit removes the .gitignore.
Merge branch 'master' into gh-pages