Fixed bad merge. Rewrote commits due to bad name of committer from leakage from test suite
Attempt to fix bad commit authors, AGAIN.

Merge branch 'master' of https://github.com/infews/anchorman