Merge remote-tracking branch 'origin/master' into #6/show-hide-items

# Conflicts:
#	dev/custom-fn.js
#	src/styles/clay/_base.scss

test/spec/lib/clay-config.js

@@ -20,12 +20,20 @@ describe('ClayConfig', function() {
       'build',
       'on',
       'off',
-      'trigger'
+      'trigger',
+      'meta'
     ];
     var clayConfig = fixtures.clayConfig(['input']);
     checkReadOnly(clayConfig, properties);
   });
 
+  describe('.meta', function() {
+    it('populates meta', function() {
+      var clayConfig = fixtures.clayConfig(['input']);
+      assert.deepEqual(clayConfig.meta, fixtures.meta());
+    });
+  });
+
   describe('throws when trying to run methods before being built', function() {
     [
       'getItemByAppKey',