end of day
Merge branch 'master' of https://github.com/cbrucks/cloud
start reorg over.  need to move reset password to javascript