1) Changed the structure of the yaml config file to allow users to
have different versions of plugins for environments (e.g. build, staging, production)
2) Commented out some unused and dead code.
A small tweak to how the yaml config file was setup.  Decided to make
the environment an attribute of the server as opposed to having it as
a separate parameter. This has two benefits:
1) Supports command line operations where multiple hosts are specified
2) Supports deploying to multiple different environments
Updated the sample yaml file to reflect changes to the structure
Merge branch 'master' of https://github.com/gboone/flannel

Conflicts:
	config.yaml.sample
	fabfile.py
Removed the lines that I had previously commented out now that I've
confirmed with @gboone that it isn't used (and he doesn't plan to
use it)
Merge pull request #2 from Ooblioob/master

Add support for multiple environments with differing version