Merge pull request #1 from ericmwalsh/master

test pull req
Minor view changes and some routing fun