Changes from 9/7/14 meeting

Fixes and changes from the 9/7/14 meeting
Merge branch 'master' of https://github.com/JDRichards/OK1_Exploring_complexity