amplab/tachyon — pull request #432 by darionyaphet (2014-09-14 13:28:35+00:00)
Title: merge diff from master

merge master ~