Merge branch 'release/1.0.0'
Merge branch 'release/1.0.1'
Merge remote-tracking branch 'upstream/master' into marathon_app_lwrp
Merge remote-tracking branch 'upstream/develop' into marathon_app_lwrp
fix marathon_app instance option
Merge pull request #12 from asher/marathon_app_lwrp

Merging this, based on visual inspection of changes. We're in the process of changing our testing infrastructure for chef cookbooks, and this particular cookbook has not received those changes yet.