makefile
merge

Merge branch 'openid' of github.com:sociam/indx into openid
merging in forgot to do

Merge branch 'openid' of github.com:sociam/indx into openid
more progress