initial stab at importing trips

Conflicts:
	src/main/resources/config.xml
import trip config

Conflicts:
	src/main/resources/config.xml
fix codenarc Integer complaint
Merge pull request #12 from smcadams86/steve/feature/trip-import-fix

Steve/feature/trip import fix