Changed shortcuts to differ between home and work
Merge branch 'master' of https://github.com/simonkolotov/SimonEnv

Conflicts:
	Bash/.SimonBashGeneral.~undo-tree~
	Bash/.SimonHomeSettings.~undo-tree~
	Bash/.SimonWorkSettings.~undo-tree~
	Bash/SimonBashGeneral
	Bash/SimonHomeSettings
	Bash/SimonWorkSettings