Revert "Revert "Removed omr""

This reverts commit fdaf0c89222472ab559c9215538e4611699f5cc7.
Revert "Revert "Converted coffeescript to javascript""

This reverts commit cf43f3ba9b3db31c308796338463f47039edd24d.
Revert "Revert "Removed unused procfile""

This reverts commit 21c3ccad4f10a0d7be0b4f071e612fee561cf4ed.
Updated angularjs version
option for formatting grad_date requested by TC
Merge pull request #200 from burke-software/template_addition

option for formatting grad_date requested by TC
Added omr removal migration
Merge branch 'develop' of https://github.com/burke-software/django-sis into develop
Updated pypi packages
Merge branch 'master' of https://github.com/burke-software/django-sis into develop
Removed one of two uses of floppy gumby forms
Change default run production to use uwsgi
correction
Merge branch 'develop' of github.com:burke-software/django-sis into template_addition
removed print statement
Merge pull request #201 from burke-software/template_addition

Template addition
Merge branch 'master' of https://github.com/burke-software/django-sis into develop

Conflicts:
	ecwsp/sis/scaffold_reports.py
new simple import version
Experiment
ANNOYING