Updated c4 reference
bump hadoop to cdh3u4
Reset Hadoop core dep to 0.20.2
Merge branch 'develop' of github.com:/Factual/drake into develop

Conflicts:
	project.clj
Add FAQ.md
Update FAQ.md
Add argument quotes in run.sh
Update README.md
Merge branch 'develop' of github.com:Factual/drake into develop
Merge branch 'develop' into feature/vineyard