Merge branch 'fix-113-dash-merge' of github.com:spencer1248/hashie