cleaned the code up, added some more units to convert between
Merge branch 'master' of https://github.com/michaelwayman/unit-converter