Merge branch 'master' into ui

Pioneers.cabal

@@ -11,21 +11,18 @@ executable Pioneers
   } else {
     ghc-options:     -Wall -Odph -rtsopts -threaded -fno-liberate-case -funfolding-use-threshold1000 -funfolding-keeness-factor1000 -optlo-O3 -fllvm
   }
-  other-module
+  other-modules:
                    Map.Types,
                    Map.Graphics,
                    Map.Creation,
                    Map.StaticMaps,
                    Importer.IQM.Types,
-                   Importer.IQM.TestMain,
                    Importer.IQM.Parser,
                    Render.Misc,
                    Render.Render,
                    Render.RenderObject,
                    Render.Types,
                    UI.Callbacks,
-                   UI.Types,
-                   UI.SurfaceOverlay
                    Types
   main-is:         Main.hs
   build-depends:   

README.md

@@ -10,14 +10,13 @@ Bugtracker/Wiki: http://redmine.pwning.de/projects/pioneers
 
 1. 	Clone this repository
 2. 	Set up cabal-sandbox
-	```
-	$ cabal sandbox init
-	$ cd deps
-	$ ./getDeps.sh
-	$ cd ..
-	$ cabal sandbox add-source deps/hsSDL2
-	```
-3. 	install libraries `sudo apt-get install libsdl2` - make sure libsdl2 is in version 2.0.1+ (shipped with Ubuntu since 14.04)
+
+		$ cabal sandbox init
+		$ cd deps
+		$ ./getDeps.sh
+		$ cd ..
+		$ cabal sandbox add-source deps/hsSDL2
+3. 	install libraries `sudo apt-get install libsdl2 libsdl2-dev libghc-llvm-dev` - make sure libsdl2 is in version 2.0.1+ (shipped with Ubuntu since 14.04)
 4. 	install dependencies `cabal install --only-dependencies`
 5. 	build `cabal build`
 6. 	run `./Pioneers`