Guard cleanups
Added encodings to all ruby files
Cleaned up tests so they work with newer rubies