Squashed commit of the following:

commit 89beae44b76193688ca655c82b025cf9f9f6b4bc
Author: mekolat <mekolat@gmail.com>
Date:   Sat Jun 21 17:53:54 2014 -0400

    fix some ugly pixels
Merge branch 'fringefix' of https://github.com/mekolat/tmwa-client-data into fringefix

Conflicts:
	maps/009-1.tmx