Preparations for private/public satis separation
Fixing rubocop complaints, adding rubocop to travis
Merge pull request #221 from fh/t/rubocop

Fixing rubocop complaints, adding rubocop to travis
Merge pull request #222 from fh/t/multiple-satis

Preparations for private/public satis separation
Fix: move all gems to bundler
Clean-up: Rakefile

 * remove duplicate lint tasks
 * remove lint completely because it's slow
Clean-up: epic fail setting for foodcritic
Change: update the latest rubocop
Update: lock chef at the one we're using on OpsWorks
Fixes Nginx for Fruitkid-Apis
Merge pull request #225 from till/fix/tests

Fix: move all gems to bundler
Fixed tests: Merge branch 'master' into t/domainnamelength
Merge pull request #226 from fh/t/domainnamelength

Fixes Nginx for Fruitkid-Apis
Merge pull request #3 from till/master

update to master