fix typo in data makefile broke csv generation
update initial data import instructions to be simpler
delete worthless migrations
get 'make import' working for real
Merge remote branch 'origin/master'