Show requested constraint info in error message for failed add-machine
fix pep8 complaint
Merge pull request #116 from mikemccracken/show-constraints-in-errors

Show requested constraint info in error message for failed add-machine
Merge with origin/master