add disk build to the makefile
change headers for the cpu benchmark
remove useless include
Merge branch 'master' of https://github.com/vlandeiro/cs553-cloudcomputing-2014