Fix a typo in an error message
Machine image fixes, including fixing the no-convergence convergence strategy
Docker examples, including machine image
Merge pull request #113 from opscode/machine_image_fixes

Machine image fixes