removed further superfluous instances
more opportunistic caching
adapt to config info
fix for img-gen
small betterments
renaming
Merge branch 'further-cleaning' of https://github.com/jvoigtlaender/afp into jvoigtlaender-further-cleaning

Conflicts:
	battleships/Settings.hs
Merge pull request #104 from jvoigtlaender/master

unnatural liftIO calls
Merge pull request #106 from jvoigtlaender/smallish

various local changes
Fix comment.
Refactor rendering code a bit.