floating usernames left in /users bigboringsystem/bigboringsystem#21
Merge branch 'master' of github.com:rtorr/bigboringsystem into richard/images