Rolled in rest of changes from CogSci 2013, plus new results

New Results just in Mechanism study