going couchapp
Merge branch 'master' into bootstrapify
reworking for portability
Merge branch 'master' into bootstrapify