Fixes to compile
Merge branch 'master' of github.com:shirro/martini-experiments