Use new AMI that won't cause issues with cloud-init apply_creds
Fix issue where Vagrant AWS deploys outside of my dev account would fail
Added files REQUIRED to have succesfull gh-pages deploy (i.c.w. sphinx)
added copyright for LEGO picture
Merge remote-tracking branch 'upstream/master' into vagrant11-providers

Conflicts:
	puppet/modules/docker/manifests/init.pp
Remove duplicate user definition
Fix Rackspace cloud user, remove dupe /home/vagrant definition
Stop using custom AMI and use standard Ubuntu AMI
docs - remove references to run -a
Merge pull request #203 from hblanks/remove-run-dash-a

docs - remove references to run -a
Merge pull request #199 from dotcloud/smalldocs

Small update to docs
Merge pull request #192 from chooper/vagrant11-providers

Fix AWS provisioning with Vagrant
Fixed broken examples in docs
use the directory where the vagrantfile is located for mounting
Fixed typo in command description for pull
Merge pull request #209 from gottagetmac/patch-1

Fixed typo in command description for pull
change docker import to docker pull

change docker import to docker pull in the basecommands doc
changed docker import to docker pull

changed docker import to docker pull, still need to make sure that the image is in the registry.
Merge pull request #205 from crazysim/docker-local-shared

Use the directory where the Vagrantfile is located for SyncFolders instead of a hard-coded "~/docker"
Merge remote-tracking branch 'upstream/master'