shaved 5 minutes off of the test run with MAGIC
Merge branch 'master' of https://github.com/sfu-fas/coursys