condensed the parser module
Merge branch 'master' of github.com:mikesteele/HampAPI

Conflicts:
	parser.js