Merge pull request #287 from gittip/simplify-error-handling

Only support negotiated simplates for errors
Merge branch 'master' into take-2-on-issue279