quick rake task for converting
Merge branch 'master' into longer_timer

Conflicts:
	Makefile