Cleaned up code by adding this where appropriate
Merge origin/master

Conflicts:
	TwoKeyListenerExample/src/com/decarlo/twokeylistenerexample/TwoKeyListenerExample.java