Cleaned code & added tests
Merge branch 'master' of ssh://github.com/chipmanc/rackSalt