bug fixes, richer data model
Merge branch 'master' of https://github.com/mjpearson/bootstrap-templar