Fixing some issues.
Fixing a few conflicts and rebuilding mins

Conflicts:
	build/snap.js
	build/snap.min.js
	external/bmoor.min.js