Merge pull request #71 from murrekatt/develop

Final cleanup in moved out util files.