Minor cleanup
Add Hive, update default size to xlarge, reduce heap sizes, and setup zookeeper configuration
Use a larger container for MapReduce
Merge remote-tracking branch 'origin/develop' into feature/update-templates

Conflicts:
	config/defaults/clustertemplates/hadoop-distributed.json
	config/defaults/clustertemplates/hadoop-singlenode.json
Merge pull request #434 from continuuity/feature/update-templates

Feature/update templates