Cleaned up Color Parser

Attempting to tidy things up
Merge branch 'master' of https://github.com/mallrat208/EnderStorage