got tests passing and added soem TODO fixes and removed console logs
Regex matching the routes didn't handle trailing slash
Merge branch 'RC1/master' into templating