scoundrels/scrib — pull request #170 by cptmashek (2014-08-09 00:48:52+00:00)
Title: Cleanup Merge

Forgot that there were outstanding files to commit.