Working on Competition Editor.
Merge branch 'master' into irjudson-competition_editor

Conflicts:
	codalab/apps/web/urls/competitions.py
	codalab/apps/web/views.py
Missed merge conflict.
editor progress.
New example
Updating to include datasets.
Updates for editing
Example program
clean up edit

also ignore build files/directories.
Working on datasets
example datasets
Merge branch 'master' into irjudson-competition_editor

Conflicts:
	codalab/apps/api/views.py
	codalab/apps/web/models.py
	codalab/apps/web/templates/web/my/index.html
	codalab/apps/web/tests.py
	codalab/apps/web/urls/competitions.py
	codalab/apps/web/views.py
Fixes after merge with master
Exposing phase data

Now working
new html

for data page.
updates for competition datasets
Break up supervisord config
Added migrations
Added mysql to requirements
Added uwsgi to config