Merge branch 'master' of https://github.com/decodelabs/df-r7-nightfireCore

Signed-off-by: Tom Wright <tom@inflatablecookie.com>
Merge branch 'master' of https://github.com/decodelabs/df-r7-nightfireCore