simplecov/oj fix
change cucumber redis ttl shim, various test fixes
case statement in queue peek
Merge pull request #581 from flapjack/rollup_tweaks

change cucumber redis ttl shim, various test fixes
fixes #560 - base_url error message on startup
reduce noise to #flapjack for travis build notifications
Merge pull request #583 from flapjack/560_base_uri_warning_web_gateway

base_url error message on startup
prepare 1.0.0rc3 release
travis irc template modification
fixes #585 - gli 2.11 compatability
make the code a bit nicer
Merge pull request #586 from flapjack/585_gli_2.11_compat

gli 2.11 compatability
fixes #588 web ui accepts api_url with trailing slash
Merge pull request #589 from flapjack/588_edit_contacts_api_url_slash

web ui accepts api_url with trailing slash
Put the line by line configuration help in the example configuration file
tie nokogiri to 1.6.2.1 for omnibus happiness
Merge branch 'master' of github.com:flapjack/flapjack
Use the newly moved icons
Fix links to refer to our new flapjack documentation

Fix links

Fix links

Fix links

Fix links
Merge pull request #590 from flapjack/documentation-fixes

Fix links to refer to our new flapjack documentation