Adding tests for the grammar and location parsers.
pep8 fixes.
Merge pull request #29 from SerenitySoftwareLLC/develop

Develop