Fix #538, pull out color/style helpers in the process - is this good?
Moved to full module inclusion and not defining methods that then call the module
Move normalize_styles to a StyleNormalizer class
normalizer spec
Merge branch 'master' into move-helpers
fix automatic merge
Merge pull request #591 from shoes/move-helpers

Fix #538, pull out color/style helpers in the process - is this good?
Set font_size correctly for nested styles in text blocks
Merge branch 'master' of github.com:shoes/shoes4
expert-pong works fine now, no need for the adjusted version [ci skip]
Acknowledge Command as a modifier key, fix #584
Merge branch 'master' of github.com:shoes/shoes4
report fitted layouts as an array if not set yet

- caused problems in simple-downloader.rb #525
Cleanup sample a bit
Move TextBlock#replace logic to DSL layer
Add redraws/flushes to changeable call_change_listeners #533
Travis: test with jruby-head but allow failures
the before install bundler mess should be cleared up by now/trust travis
Update .ruby-version [ci skip]
Remove log4j fixes #513