Merge pull request #267 from dacoinminster/master

Pull request of commits and reverts of those commits to get my copy synced up with Master. There's probably a better way . . . 

(THIS MERGE HAS NO REAL CHANGES)