Clean up migrations,
fix gitignore database.yml issues