fixing whitespace issues
Detect and report previous migration
Merge remote-tracking branch 'upstream/master'

Conflicts:
	migrate.py