OMFG FINALLY
Merge branch 'ChrisDevOps' of https://github.com/ishaantaylor/canvas-server into ChrisDevOps