Removed profiling tools
Syncing two machines

Merge branch 'master' of https://github.com/noamross/sodi

Conflicts:
	src/run_sodi.cpp
Merge branch 'master' of https://github.com/noamross/sodi
Merging in from Rcpp-Dev

Merge branch 'master' of https://github.com/noamross/sodi

Conflicts:
	src/run_sodi.cpp