Merge branch 'master' into Eric-other-changes
let's get quizzical!
Merge branch 'master' into Eric-other-changes
Merge pull request #48 from kmblake/Eric-other-changes

Eric other changes
Merge branch 'master' into history
Fixed exception handling