Commented out the auto line number scroll
Merge remote-tracking branch 'upstream/master' into develop

Conflicts:
	tools/install.sh
Merge branch 'master' into develop
update the gitignore so we can track common-alias-noi