correct config
Merge branch 'master' into hknow

Conflicts:
	config.json
Merge branch 'master' into hknow
Merge branch 'master' into hknow
new s3name. will it work?
Merge branch 'master' into hknow
fix .gitignore
better dir
Merge branch 'master' into hknow
this test is ready for jessica
better jessica ready
meta.csv didn't transfer for some reason
first pass design tweaks check it out
app_helper
Merge branch 'design-tweaks' of https://github.com/sherah/wiki-know into hknow
remove 'ENV'