Merge remote-tracking branch 'ocramius/mvc-router-from-locator'