upgrade to latest master. adds new features on handlebars and routing