updates to routing and stuff
Merge branch 'master' of https://github.com/nachosgrande/System-Prototype