Merge branch 'master' of github.com:sfu-fas/coursys
move haystack updates to Celery
Merge branch 'master' into deployed-2014