Updates from jan sitdown
Merge branch 'jan_sitdown' of github.com:JIFFinc/ruby-style-guide into jan_sitdown