correct README since people isn't part of darmok
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Properly indicate licensing terms
Merge branch 'master' into ruby19rails3

Conflicts:
	app/controllers/status_controller.rb
	app/helpers/data_helper.rb
	app/models/page.rb