Fixing #53, #56, #63, #58, #59, #60, #61, #64

Try this out, I know it has the fixing compile errors revision, but it's after your revision so I think it's just date / time stamps that it was picking up differences on. 

So ie; it should merge fine.