Merge pull request #1036 from dorkster/fixes

Restrict Entity movement to a multiple of UNITS_PER_PIXEL_*