Refactored toggle selection
Cleaned up and made tests more comprehensive
Merge branch 'master' of https://github.com/dwimmer/ArgumentMapping

Conflicts:
	tests.js