Merge branch 'version_2' of github.com:/infochimps/cluster_chef.git

Conflicts:
	.gitignore
	README.textile
	cookbooks/boost/metadata.rb
	cookbooks/build-essential/README.md
	cookbooks/cloudera_hue/recipes/default.rb
	cookbooks/cron/README.md
	cookbooks/cron/metadata.rb
	cookbooks/ganglia/README.rdoc
	cookbooks/hadoop_cluster/recipes/format_namenode_once.rb
	cookbooks/hadoop_cluster/recipes/hadoop_webfront.rb
	cookbooks/hadoop_cluster/recipes/jobtracker.rb
	cookbooks/hadoop_cluster/recipes/namenode.rb
	cookbooks/hadoop_cluster/recipes/std_hdfs_dirs.rb
	cookbooks/hadoop_cluster/recipes/system_internals.rb
	cookbooks/hadoop_cluster/templates/default/apt-sources-cloudera.list.erb
	cookbooks/hadoop_cluster/templates/default/hue.ini.erb
	cookbooks/hbase/README.rdoc
	cookbooks/hbase/recipes/hbase_regionserver.rb
	cookbooks/hive/README.rdoc
	cookbooks/rvm/recipes/.gitkeep
	cookbooks/thrift/attributes/thrift.rb
	cookbooks/thrift/recipes/default.rb
	cookbooks/zookeeper/README.rdoc
	cookbooks/zookeeper/recipes/zookeeper_server.rb
	lib/cluster_chef/knife/bootstrap/ubuntu10.04-cluster_chef.erb
	lib/cluster_chef/knife/cluster_bootstrap.rb
	lib/cluster_chef/knife/cluster_launch.rb
	lib/cluster_chef/knife/cluster_show.rb
	notes/ec2pricing-and-capacity.numbers
	roles/cassandra_datanode.rb
	site-cookbooks/base/recipes/cleanup.rb
	site-cookbooks/base/recipes/default.rb
	site-cookbooks/benchmarkable/attributes/benchmarkable.rb
	site-cookbooks/cassandra/attributes/cassandra.rb
	site-cookbooks/cassandra/recipes/default.rb
	site-cookbooks/cassandra/templates/default/iptables.erb
	site-cookbooks/cloudera_hue/README.rdoc
	site-cookbooks/cloudera_hue/recipes/default.rb
	site-cookbooks/cloudera_hue/templates/default/hue.ini.erb
	site-cookbooks/cluster_chef/README.rdoc
	site-cookbooks/cluster_chef/recipes/cluster_webfront.rb
	site-cookbooks/cluster_chef/recipes/dedicated_server_tuning.rb
	site-cookbooks/ec2/README.rdoc
	site-cookbooks/ganglia/README.rdoc
	site-cookbooks/hadoop_cluster/attributes/hadoop_cluster.rb
	site-cookbooks/hadoop_cluster/recipes/bootstrap_format_namenode.rb
	site-cookbooks/hadoop_cluster/recipes/bootstrap_hdfs_dirs.rb
	site-cookbooks/hadoop_cluster/recipes/format_namenode_once.rb
	site-cookbooks/hadoop_cluster/recipes/hadoop_dir_perms.rb
	site-cookbooks/hadoop_cluster/recipes/hadoop_webfront.rb
	site-cookbooks/hadoop_cluster/recipes/namenode.rb
	site-cookbooks/hadoop_cluster/recipes/secondarynamenode.rb
	site-cookbooks/hadoop_cluster/recipes/secondarynamenode_only.rb
	site-cookbooks/hadoop_cluster/recipes/std_hdfs_dirs.rb
	site-cookbooks/hadoop_cluster/recipes/system_internals.rb
	site-cookbooks/hadoop_cluster/recipes/update_apt.rb
	site-cookbooks/hadoop_cluster/templates/default/apt-sources-cloudera.list.erb
	site-cookbooks/hadoop_cluster/templates/default/hue.ini.erb
	site-cookbooks/hadoop_cluster/templates/default/sources.list.d-cloudera.list.erb
	site-cookbooks/hadoop_cluster/templates/default/webfront_index.html.erb
	site-cookbooks/hbase/README.rdoc
	site-cookbooks/hbase/attributes/hbase.rb
	site-cookbooks/hbase/recipes/hbase_regionserver.rb
	site-cookbooks/hbase/recipes/regionserver.rb
	site-cookbooks/hbase/templates/default/export_hbase_tables.rb.erb
	site-cookbooks/hive/README.rdoc
	site-cookbooks/jruby/recipes/default.rb
	site-cookbooks/jruby/recipes/gems.rb
	site-cookbooks/nagios/libraries/default.rb
	site-cookbooks/nfs/templates/default/fix_nfs_on_maverick_amis.sh
	site-cookbooks/nodejs/README.rdoc
	site-cookbooks/pig/attributes/pig.rb
	site-cookbooks/pig/recipes/install_from_package.rb
	site-cookbooks/python/attributes/default.rb
	site-cookbooks/zookeeper/attributes/zookeeper.rb
	site-cookbooks/zookeeper/recipes/default.rb
	site-cookbooks/zookeeper/recipes/server.rb
	site-cookbooks/zookeeper/recipes/zookeeper_server.rb
	standard_cookbooks/boost/metadata.rb
	standard_cookbooks/build-essential/README.md
	standard_cookbooks/build-essential/recipes/default.rb
	standard_cookbooks/runit/files/default/runsvdir
Add 'vendor/infochimps/pig/' from commit 'a52aaa3cc0954ffb3b3d0c314331b4497de18703'

git-subtree-dir: vendor/infochimps/pig
git-subtree-mainline: a09e2333c5c2c9eff8a39d8a2f373a5e6d1b83ac
git-subtree-split: a52aaa3cc0954ffb3b3d0c314331b4497de18703
Add 'vendor/infochimps/hbase/' from commit '06548c4d9275ef445a34ca81cc1465200f11b145'

git-subtree-dir: vendor/infochimps/hbase
git-subtree-mainline: 73d85d5870b3690897b8e0677d8fb9a9b6bd4cdc
git-subtree-split: 06548c4d9275ef445a34ca81cc1465200f11b145
Add 'vendor/infochimps/hadoop_cluster/' from commit '1994f5c10ebce41a9f299cfd2bfc054a4e8884e1'

git-subtree-dir: vendor/infochimps/hadoop_cluster
git-subtree-mainline: b97d4d5b3d7b9e4378138266899e6ec0a39fc744
git-subtree-split: 1994f5c10ebce41a9f299cfd2bfc054a4e8884e1
Add 'vendor/infochimps/elasticsearch/' from commit '3a2f55c4ec64e9a9dfe6aed3c8558a6de06d8660'

git-subtree-dir: vendor/infochimps/elasticsearch
git-subtree-mainline: ae7325770ec21693e489953f42a541d6aabc27f6
git-subtree-split: 3a2f55c4ec64e9a9dfe6aed3c8558a6de06d8660
Add 'vendor/infochimps/cassandra/' from commit '5cb22a2af065b498d7e906b3fd53691cd2daa1fe'

git-subtree-dir: vendor/infochimps/cassandra
git-subtree-mainline: 1b593f1297e982168b08de95b781b9f743a3f6f7
git-subtree-split: 5cb22a2af065b498d7e906b3fd53691cd2daa1fe
Adding strongswan (written by @schade)
Changed over to a four layered approach for properly setting up most types of VPNs possible with strongswan. This change is widespread and should ease some of the expected pain usually associated with being chosen as the rube... er; I mean the best, man to setup your company's VPN. Version has now at 0.2.0 to reflect this change. Client configs are now available under '/etc/ipsec.d/client/<connection-type>'. For more detailed information about the new layout, please read the README.md at the top level of the strongswan cookbook.
Doing some light houscleaning to remove cruft from the old monolithic layout. Commit will be staged while permission errors are sorted out
Correct some of the various configs for both server and client
adjusting and adding content to README.md in strongswan cookbook
more chages and some layout tweaks for README.md in strongswan cookbook
massaging the markup to match what I originally intended; again for README.md in the strongswan cookbook
massaging the markup to match what I originally intended, part deux; again for README.md in the strongswan cookbook
massaging the markup to match what I originally intended, part tres; again for README.md in the strongswan cookbook
massaging the markup to match what I originally intended, and now I understand github markup just a wee bit better; again for README.md in the strongswan cookbook
Further tweaking of documentation in README.md
some final branching logic tweaks in attributes/default.rb to correct various config file issues we were seeing randomly.
missed a needed tweak; corrected
fixed the niggling masquerade bug which wasn't getting passed the value for it's attribute.