Please update to the latest develop revision

The code base has changed a lot since this branch was made. Please update your master to this version, which includes all of your work.