squashed commits
Merge branch 'jra_reset_eunit-squashed' of https://github.com/basho/rebar into jra_reset_eunit-squashed