Some cleanup + Pyro and Switch arrows.
Fixed some bugs.
Merge branch 'master' into withStaticInstance

Conflicts:
	src/com/xorinc/xoarrows/arrows/PyroArrow.java