stats mode integration
Merge branch 'master' of https://github.com/supersparks/sifteo

Conflicts:
	src/Makefile
	src/main.cpp