JPM feedback incorporated
Merge branch 'jep' of github.com:jsantell/addon-sdk into jep