Add main/dependency-reduced-pom.xml to .gitignore which generated file from maven shade.
Fix merge conflict.
Merge pull request #221 from hsaputra/add_dependency_reduced_pom_xml_togitignore

Add main/dependency-reduced-pom.xml file to .gitignore
Merge branch 'master' of https://github.com/amplab/tachyon
update Thrift to 0.9.0 and tested on Mac Mavericks and Ubuntu 3.8.0-29-generic