Add changes made so far to CHANGELOG
Add more items to changelog
Update Gemile to latest curate version
Merge branch 'feature/update-changelog' into develop
Set up environment for local and travis tests
Pin Kaminari to 0.15.1 to fix facet error when clicking more
Update CHANGELOG
Merge pull request #178 from uclibs/feature/#146-facet-nomethoderror

Pin Kaminari to 0.15.1 to fix facet error when clicking more
Merge branch 'feature/update-changelog' into develop
Fixing the 'Clear Limits' button in app as well as the gem
Add path for bundler to check_resque_running.sh
Fix merge conflict in Gemfile