Updated Router

Updated the router to reflect changes here: http://leeps.ucsc.edu/redwood-wiki/browser/expecon-router/main.go
Also fixed some bugs with that implementation. I've tested this with several experiments and everything seems to work just as well as the previous version.