Merge downstream changes

[Eric Schulte](http://cs.unm.edu/~eschulte/) and [Tero Hasu](http://terohasu.net/) have made quite a few enhancements and fixes to epresent but neither seems keen to issue a pull request, so I've merged their changes and cleaned up the directory structure and README file a bit.