Merge pull request #15 from splintercode/development

Development
Merge remote-tracking branch 'origin/development'
Merge remote-tracking branch 'origin/gh-pages'
Merge remote-tracking branch 'origin/development'
Merge remote-tracking branch 'origin/gh-pages'
Merge remote-tracking branch 'origin/development'
Merge remote-tracking branch 'origin/gh-pages'
Merge remote-tracking branch 'origin/gh-pages'
Merge remote-tracking branch 'origin/gh-pages'
Merge remote-tracking branch 'origin/gh-pages'
Merge remote-tracking branch 'origin/gh-pages'
Merge remote-tracking branch 'origin/gh-pages'
Merge remote-tracking branch 'origin/gh-pages'
Merge remote-tracking branch 'origin/gh-pages'
Merge remote-tracking branch 'origin/gh-pages'
Merge remote-tracking branch 'origin/gh-pages'
Merge remote-tracking branch 'origin/gh-pages'
Merge remote-tracking branch 'origin/gh-pages'
Merge remote-tracking branch 'origin/gh-pages'
Merge remote-tracking branch 'origin/gh-pages'