Merge branch 'hotfix/fix-travis-ci'
Merge branch 'release/0.4'
Add build and idea dirs to gitignore

Ignore build artifacts as well as the jetbrains directory
Fix docblock bug

Fix docblock bug picked up by scrutinizer-ci
Merge branch 'feature/scrutinizer-fixes' into develop
Add tests for invalid json

Add mapper tests to ensure that exceptions are thrown
when you try to parse invalid json
migrate from psr0 to psr4

Migrate the app from psr0 compliance to psr4 compliance