Temp maps keep their map slot now
Merge branch 'master' of https://github.com/sirjuddington/SLADE
Minor tweaks.
Updated sfmod to 1.1.0

Since SFML 1.6 compatibility has been dropped since
583313079f732f8833f12d97545d2a4f6392d5a8, it's not a problem.
Merge pull request #94 from Gaerzi/master

Sync with my fork.