Revert d20e063..63fcac1

This rolls back to commit d20e063117640f15ed6a43304deb3c1ac1909577.
Merge branch 'master' of https://github.com/kaipeng/prophet

Conflicts:
.idea/workspace.xml
blp/views.pyc
dashboard/__init__.pyc
dashboard/admin.pyc
dashboard/migrations/__init__.pyc
dashboard/models.pyc
dashboard/static/app/js/app.js
dashboard/static/app/views/chart-flot.html
dashboard/static/app/views/partials/settings.html
dashboard/static/index.html
dashboard/static/master/jade/views/chart-flot.jade
dashboard/static/master/jade/views/partials/settings.jade
dashboard/static/master/js/modules/config.js
dashboard/static/master/js/modules/controllers/flot-chart.js
dashboard/static/master/js/modules/controllers/portlet.js
dashboard/urls.py
dashboard/urls.pyc
dashboard/views.pyc
dump.rdb
nucleus/static/js/app.js
nucleus/urls.pyc
nucleus/views.pyc
prophet/settings.py
prophet/settings.pyc
prophet/urls.py
prophet/urls.pyc
Merge branch 'master' of https://github.com/kaipeng/prophet

Conflicts:
	.idea/workspace.xml
	blp/views.pyc
	dashboard/__init__.pyc
	dashboard/admin.pyc
	dashboard/migrations/__init__.pyc
	dashboard/models.pyc
	dashboard/static/app/js/app.js
	dashboard/static/app/views/chart-flot.html
	dashboard/static/app/views/partials/settings.html
	dashboard/static/index.html
	dashboard/static/master/jade/views/chart-flot.jade
	dashboard/static/master/jade/views/partials/settings.jade
	dashboard/static/master/js/modules/config.js
	dashboard/static/master/js/modules/controllers/flot-chart.js
	dashboard/static/master/js/modules/controllers/portlet.js
	dashboard/urls.py
	dashboard/urls.pyc
	dashboard/views.pyc
	dump.rdb
	nucleus/static/js/app.js
	nucleus/urls.pyc
	nucleus/views.pyc
	prophet/settings.py
	prophet/settings.pyc
	prophet/urls.pyc
added pip requirements