Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Adding Showdown to address #42
  Renamed table "users" to "osmusers Renamed "actions" in Challenge module to done_dialog, and added logic in client to support it Added "checkout" function to task (not yet functional)
  First crack at a dialog creator
  nextUp now closes the dialog box
Merge branch 'master' of git://github.com/mvexel/maproulette

* 'master' of git://github.com/mvexel/maproulette:
  Update README.md
Merge branch 'master' of git://github.com/mvexel/maproulette

* 'master' of git://github.com/mvexel/maproulette:
Merge branch 'master' of github.com:osmlab/maproulette

* 'master' of github.com:osmlab/maproulette: (32 commits)
  Cleaning up the views
  Changing the way the challenge types are stored
  Renamed templates back to types for clarity. Removed unnessary helpers
  Fixing the models and adding functionalityt o create new "states" (ie actions)
  The near function does not belong in a task in the SQLAlchemy model
  Removing SQLAlchemy from dependencies
  Fixing typo in models
  Removing the bang line from models since this is not an executable file
  Moving database.db into models for complex model interaction
  Centralizing the database and also bringing config into line
  Get and set preferences on an OSM user
  Create div rather than changing every div
  Redirect user to OSM OAuth if not logged in
  Remove unused imports
  Fix a few api views
  javascript typos
  Documentation: CoffeeScript
  Documentation: add2virtualenv
  Documentation: clone from new repo
  finalizing the templates
  ...
master in running state (still gives a coffee related error for me)
Merge branch 'master' of github.com:osmlab/maproulette

* 'master' of github.com:osmlab/maproulette:
  Partially adding new views
  Adding tablenames and a task relationship back to the challenge
  The dialog is part of the challenge type
  Editors are part of the type, not the individual challenge

Conflicts:
	maproulette/views.py