fix makefile
Dropping hplay for now.
Merge remote-tracking branch 'evan/master' into heroku