Merge pull request #285 from haoyuan/master

add Tachyon Related Configuration into conf template
(cherry picked from commit eab9ef5c6f661914a1cc987d548d9fbd48c3aa96)

Signed-off-by: Reynold Xin <rxin@apache.org>