Merge pull request #2 from Shoat/master

IT IS MORE BETTERER (v2)
Merge remote branch 'upstream/master'
additional punctuation cases that people insist on using fnord
Merge branch 'master' of https://github.com/maradine/reprobot
Merge remote branch 'upstream/master'

Conflicts:
	SourceHandler.java