Merge branch 'master' into aelshen_branch
Updated MTurk data, fixed weird new errors
Merge branch 'aelshen_branch'