Merge origin/master

Conflicts:
	src/main/java/com/cnaude/purpleirc/PurpleIRC.java