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.