Merge remote-tracking branch 'upstream/master'
Remove the Shindig Samples dependency it is not needed
Merge pull request #31 from ryanjbaxter/master

Remove shindig samples dependency