usertype && the other thing
Merge branch 'develop' of github.com:sstelfox/fathomless_twilight into develop