remove netty dep from hadoop
add thrift code to repo.
fix build
Merge branch 'master' of https://github.com/amplab/tachyon into master-csd

Conflicts:
	.gitignore