Merge pull request #49 from apotheos/master

Added some pre-demo sexiness.
added travis file