A whole bunch of changes, plus Ruby 2.0/1.8 compatability fixes
Merge branch 'master' of github.com:epitron/epitools