begins refactor of parser and parser spec
Merge branch 'master' of github.com:natekandler/parser into test-update
Merge pull request #2 from natekandler/test-update

Test update