Fixed things to use the gps.position property
Merge branch 'add-emulator' of ssh://192.168.1.102/~/git/sailbot2013 into add-emulator

Conflicts:
	emulator
Position is now a property
Fixed things to use the gps.position property
Sorting merge conflicts
Merge commit '111173a' into add-emulator
More merge confilicts
Fixed evaluating integers
Move the socket connection into the loop
Moved the socket connection back