Add mouse settings
Merge remote-tracking branch 'upstream/master' into mouse

Conflicts:
	README.md
Merge pull request #38 from xdissent/mouse

Add mouse settings