Merge branch 'cluster_get_nodes_update' into vanilla_improvements
Update starcluster/clustersetup.py

breaks starting new cluster if this functionality is commented out
Merge pull request #6 from mylons/patch-1

Accepted. This branch needs to be consistent with vanilla.
Added a list of changes of vanilla_improvements
Added note about sshfs/nfs
Added note about slots count
Merge branch 'datacratic_dev' into vanilla_improvements
Merge branch 'vanilla_improvements' of github.com:datacratic/StarCluster into vanilla_improvements
Merge branch '217_setup_cluster_user_fix' into vanilla_improvements
Merge branch '189_sg_patience' into vanilla_improvements
Merge branch '189_sg_patience' into vanilla_improvements
Merge branch 'develop' of git://github.com/jtriley/StarCluster into vanilla_improvements
Merge branch 'vanilla_improvements' of github.com:datacratic/StarCluster into vanilla_improvements
merged with threadpool mapWithJobId
Merge branch 'vanilla_improvements' of github.com:datacratic/StarCluster into vanilla_improvements
Merge branch 'develop' of git://github.com/jtriley/StarCluster into vanilla_improvements

Conflicts:
	starcluster/cluster.py
	starcluster/clustersetup.py
	starcluster/plugins/sge.py
	starcluster/threadpool.py
Applied patch for threadpool map
Applied slots count enh
Removed comment about non trunk function
Removed datacratic plugins from the vanilla branch