Merge pull request #2 from ericmwalsh/master

Minor view changes and some routing fun
Merge remote-tracking branch 'upstream/master'