Better error formatting
Merge pull request #15 from thomasboyt/nicer-errors

Better error formatting