mergy from emax

Merge branch 'openid' into oe
patch to query

Merge branch 'emax'
merging of new work on boxes and things

Merge branch 'emax'
Store references to all connections made in a token
Change erroneous logging.error call to logging.debug
Run DELETE FROM queries correctly (this was missing since refactor)
bringing in changes towards box stuff

Merge branch 'emax' of github.com:sociam/indx
oops forgot to commit
merging in master

Merge branch 'master' of github.com:sociam/indx
appslist bugfix
merging in new openid

Merge branch 'emax' into oe
patches

Merge branch 'openid' into oe