import rake cleanup and model association fix
Merge branch 'master' of https://github.com/bthornto/iifa

Conflicts:
	lib/tasks/import_flavor.rake
Merge branch 'master' of https://github.com/bthornto/iifa