Undo split of base and layout templates.

Was not fully functional and should have been merged with master.

Current changes may help in overriding styles. But the main purpose was
to get the old way of functioning back.
Update Changes.
travis
Bump version to 0.3.1.
Project maintenance.

Make sure scaffolds run in dojo dist mode.
Update changes.
Update dependency list for scaffolds.
add validation rule to have at least one label
refs #91
add delete permission
default role in demo is now admin (has all the rights)
refs #88
improve validation test quality and thereby improve validation quality
update skosprovider
refs #94
update changes
Update CHANGES.rst
update fixtures
invalid note type
support postgresql
Merge branch '0.4.0' of https://github.com/OnroerendErfgoed/atramhasis into 0.4.0
Update to skosprovider_sqlalchemy 0.3.0
refs #99
uodate tests and some refactoring
refs #99
refactoring
add alembic revision for skos matches tables
refs #99
use in memory db for testing
update dev requirements