cleaning for demo.
Merge pull request #50 from seek-city/josh

Josh
Merge pull request #51 from seek-city/develop

moving fixes to master.