Merge branch 'auth-openid' of git://github.com/jnovack/phorkie into auth-openid