fixed usernames for tv
Merge branch 'master' of https://github.com/smav/configs
updated work aliases