Manual merge resolved for latest on 2013-07-29

I had lots of conflicts. After resolving and `qrefresh` I ended up with this...

(Currently clobber and building)