Spike trains imported and tested.

Also, waits for file upload to complete at end of import.
Merge branch 'spike-trains'

Conflicts:
	ovation_neo/importer.py
	ovation_neo/test_axon_mapping.py