display short name in profile page and add edit and upload buttons back in
Merge branch 'master' of github.com:rjswenson/Taggd.it