Merge pull request #33 from haoyuan/ampcamp4

Gonna merge this so I can test it
Merge pull request #37 from haoyuan/ampcamp4

upgrade to use tachyon 0.4.0