misc cleanup
almost there!
Merge branch 'master' of https://github.com/jaronjones/instructure