Adds simple database parser, fixes in intensity measures
Merge pull request #4 from g-weatherill/fixes_sept14

Adds simple database parser, fixes in intensity measures