Kill some dead code
Fix livereload port number in demo
Fix rendering of watermark
Merge pull request #157 from irskep/fix-watermark

Fix watermark rendering, livereload, kill dead code