removed unnecessary options property, and removed a duplicate var binding
another duplicate var binding, and trailing whitespace cleanup
Merge pull request #24 from aiannacc/bugfix-race-conditions

Fix race conditions, revamp user settings system, introduce angularjs and jqueryui
Merge branch 'bugfix-race-conditions'
Merge branch 'master' into auto-automatch

Conflicts:
	src/ext/alwaysStack.js
	src/ext/autokick.js
	src/ext/automatch.js
	src/ext/blacklist.js
	src/ext/kingdom_generator.js
	src/ext/tableState.js