Small Updates
Merge branch 'master' of github.com:wolfy1339/Wolfy-Powder-Toy into develop

Conflicts:
	.travis.yml