Update settings page to actually work
Add some error handling
Combine consecutive RUNs in Dockerfile

Also run apt-get upgrade and apt-get clean.
Merge pull request #17 from zooniverse/settings-page

Settings page
Get rid of most calls to the old mock data stores (classifier to come)
Remove unused files
Add some notes about the dispatcher
Move the model class into lib
Rename data directory "mock-data"
Update readme
Merge pull request #22 from zooniverse/dockerfile-combine-run

Combine consecutive RUNs in Dockerfile
Remove extra columns component
Merge pull request #23 from zooniverse/remove-cruft

Remove cruft
Merge branch 'master' into update-react-0.12.0

Conflicts:
	app/classifier/drawing-tools/ellipse.cjsx
	app/classifier/drawing-tools/point.cjsx
	app/mock-data/users.coffee
Fix merge