Some tidy up
Merge branch 'master' of https://github.com/rowdyrabbit/link-shortener