Merge pull request #4 from lukecarbis/master

Update from master.
Fix local presentations
Better sanitizing and escaping