Fixed and simplified collision

Previous collision detection was a big kludge. Moved projecting location
to the individual movement call (may move this to a separate function),
and simplified collision function to one test, rather than individuals
for 6 cardinals (which wouldn't work for none-cardinal movement anyway).

Should I rename sMove to dirMove?