Fixes and stuff
Stupid whitespace
Fixed merge conflict
Merge branch 'develop' of github.com:sstelfox/fathomless_twilight into develop