#52 and #69 - attempts to merge in the redirect change from #52 in a more general way to address #69

there's a new cli unit test added and I expect that travis will try to validate this pull request