Added edge-pushing with a tolerence setting. This includes cursor locking
and visiblity toggling.
Merge branch 'master' into hazenreturns

Conflicts:
	src/main.cpp