Add Code Climate badge to README
fixed missing ; in edit.js.haml
allow permissions partial to render for models with underscored names
Merge pull request #262 from reubenjs/edit-fix

fixed missing ; in edit.js.haml
Merge pull request #263 from reubenjs/entities-permissions-fix

allow permissions partial to render for models with underscored names
[ci skip] Tidied up pull request.
Merge pull request #265 from brynary/master

Add Code Climate badge to README
Added hook to view_factory.
Fixed syck to psych file
Converted locale files to from syck to psych
Convert settings from syck to psych and remove dependency on Syck.
Add psych to gemspec to be explicit about using it.
Address Issue #270. Fixed procfile command for heroku.
Address Issue #270. Fixed procfile command for heroku.
Merge branch 'psych'
Fixed issue #272 - tags do not exist on tasks.
Converted stub! to stub.
Updated specs to rspec 2.14
Update capybara and selenium.
Address Issues #242 and #245. Fix cohsen_select helper to be able to work on multiple select boxes with chosen