Merge pull request #1 from lizwilkins/routes

Please review our implementation of 'routes'
build associations
resolve merge conflicts
squashes