Make convert_r3 pretty
Merge branch 'r4' of https://github.com/rmcauley/rainwave into r4

Conflicts:
	convert_r3.py