Clean up; refactoring of Payload; improved tests
Updated gitignore to ignore emacs #filename# files