Allow moving away from waypoint wthout automatically switching to next waypoint
Merged with current master to resolve conflicts.

Changed wording on options/ship panel
Remove working files commited by mistake
Merge pull request #195 from jongough/mainain_waypoint_active

Mainain waypoint active