Add in changes from #16 that were overwritten

Adding back some changes I made a few weeks ago. I didn't grok how the wiki/submodule script worked at the time so those changes were overwritten.