Merge branch 'master' into will/amazon

Conflicts:
	db/schema.rb
variables in rake task shouldn't be global
Merge branch 'will/amazon' of github.com:calblueprint/worldreader into will/amazon