Getting latest updates from master#30

Merged

flysaiah merged 7 commits intoflysaiah:masterfrom

RunestoneInteractive:master

May 2, 2016

Commits on Mar 5, 2016

this dissappeared for a while
bnmnetp
committed

Commits on Apr 4, 2016

Merge remote-tracking branch 'RunestoneInteractive/master'
ericsonga
committed
Updates to add a notimer option on the timed exams and changes to allow paired distractors in Parsons problems
ericsonga
committed

Commits on Apr 28, 2016

Fix indent levels and mixing of tabs
bnmnetp
committed

Commits on May 1, 2016