Make listings work etc
Merge branch 'master' of github.com:EFJackson/SMS