Fix a problem with file loading.
Merge branch 'master' of https://github.com/Winterbraid/lscolors_ruby

Resolve some conflicts.