temp stash
Merge branch 'master' of github.com:rossjones/shortly
Fix up for bad syntax