change for upstream.
add rake
Merge branch 'pahoughton-devel' into pahoughton-test