Merge pull request #1 from erikerikson/master

disable comma dangle for es6 compatibility

Author: knitterb

package/lib/compileFunctions.js

@@ -45,7 +45,7 @@ module.exports = {
         || '60s';
       funcTemplate.properties.labels = _.assign({},
         _.get(this, 'serverless.service.provider.labels') || {},
-        _.get(funcObject, 'labels') || {}
+        _.get(funcObject, 'labels') || {} // eslint-disable-line comma-dangle
       );
 
       const eventType = Object.keys(funcObject.events[0])[0];