Use new martini namespace
Merge pull request #14 from hwartig/master

Use new martini namespace