Bug 1033647 - Update Makerstrap to 0.2.0
Merge pull request #825 from k88hudson/makerstrap-update

Requesting a pull to mozilla:master from k88hudson:makerstrap-update