Attempt at reorganising
Merge remote-tracking branch 'upstream/master' into refactor

Conflicts:
	ruby/cf_cname_flattener.rb
Merge pull request #2 from ronny/refactor

Attempt at reorganising