Renaming/cleanup
Merge branch 'master' of github.com:ryanplusplus/mock.lua