Merge remote-tracking branch 'origin/master' into UXUI-212

Conflicts:
	docs/src/Nav.jsx

.coveralls.yml

@@ -0,0 +1,2 @@
+service_name: travis-ci
+repo_token: uQA5sgMsKV9lr9hy1YCpnNHRP66MEVjP4

.eslintrc

@@ -1,6 +1,7 @@
 {
   "globals": {
-    "jest": true
+    "TestUtils": true,
+    "assert": true
   },
   "env": {
     "browser": true,

.gitignore

@@ -12,6 +12,9 @@
 *.sublime-workspace
 .idea
 
+# Vim
+*.swp
+
 # CodeKit
 config.codekit
 .codekit-config
@@ -24,3 +27,4 @@ node_modules/
 docs/assets/bundle.js
 .grunt/
 npm-debug.log
+coverage/*

.travis.yml

@@ -6,3 +6,4 @@ env:
   matrix:
     - TEST_STEP=lint
     - TEST_STEP=test
+    - TEST_STEP=coveralls

CHANGELOG.md

@@ -0,0 +1,10 @@
+### 0.6.6 - 2015-05-29
+- Adds default purpose and size to button (and flag)
+- Swaps button tag to anchor tag when an href is passed in
+- Adds and click handler
+- Adds data attribute functionality.
+
+### 0.6.5 - 2015-05-29
+- Adjust the tile component to utilise the image component
+- Adds some default styling for images
+- Spaces out the articles on docs better

CONTRIBUTING.md

@@ -32,7 +32,7 @@ This guide will be constantly updated.
 
 * Include screenshots and animated GIFs in your pull request whenever possible.
 * Include thoughtfully-worded, well-structured
-  [Jest](https://facebook.github.io/jest/) specs. See the [Specs Styleguide](#specs-styleguide) below.
+  [Mocha](http://mochajs.org/) specs. See the specs styleguide below.
 
 ### Linting
 We use [ESLint](http://eslint.org/) to ensure consistency in our repo.
@@ -57,9 +57,9 @@ Please ensure you:
 
 ## Specs Styleguide
 
-- Include [Jest](https://facebook.github.io/jest/) specs in the `__test__` folder in area for developement, if the
+- Include [Mocha](http://mochajs.org/) specs in the `__test__` folder in area for developement, if the
   directory doesn't exist, please add one.
-- Run test using `jest`
+- Run test using `npm test`
 - treat `describe` as a noun or situation.
 - treat `it` as a statement about state or how an operation changes state.
 

README.md

@@ -1,5 +1,6 @@
 [![Build Status](https://travis-ci.org/holidayextras/ui-toolkit.svg)](https://travis-ci.org/holidayextras/ui-toolkit)
 [![Dependency Status](https://gemnasium.com/holidayextras/ui-toolkit.svg)](https://gemnasium.com/holidayextras/ui-toolkit)
+[![Coverage Status](https://coveralls.io/repos/holidayextras/ui-toolkit/badge.svg?branch=coveralls)](https://coveralls.io/r/holidayextras/ui-toolkit?branch=coveralls)
 
 <header style="background: rgb(222,75,149);padding:2em;text-align:center">
   ![UIToolkit](docs/assets/toolkit-banner.png)
@@ -137,10 +138,7 @@ Browserify bundles from the `dev/example.jsx`. Loading the `dev/index.html` in y
 
 UI Toolkit Themes
 ---
-A collection of custom themes for UI Toolkit are listed below:
-
-* [Holiday Extras](https://github.com/holidayextras/ui-brand-hx)
-* [Essential Travel](https://github.com/holidayextras/ui-brand-et)
+A collection of custom themes for UI Toolkit are coming soon.
 
 Component Documentation
 ---