Simplify api context stuff
Merge branch 'master' of github.com:tanel/kopsik