CONTRIBUTING:`grunt amdconfig`, not `amber config`
Merge remote-tracking branch 'upstream/master' into up