Merge branch 'develop'
Forced rake 0.8.7 to be installed in order to work with ruby 1.8.7
Merge branch 'markpfletcher-force_rake_version' into develop