Merge pull request #60 from noodlehaus/develop

'templates', 'router', 'url', and method override