model updates, new routes
Merge branch 'develop' of https://github.com/markreid/brude into develop

Conflicts:
	views/index.hjs