Few changes to routing
Merge branch 'estimator' of https://github.com/cmusv-sc/ArchF2013-Project3-FT into estimator