fixed merge conflict

Merge pull request humaan#52 from humaan/develop

New v0.3.0 fixes and enhancements

Bumped version number.

Merge pull request humaan#7 from humaan/fix-issue-6

Fix issue 6

Merge pull request humaan#4 from humaan/modaal-v029

Modaal v0.2.9 Updates and Bug Fixes

Minor version bump and docs update

Copy updates to demo and readme