Cleaned up import form
Merge branch 'master' of https://github.com/cookacounty/IPtracker.git

Conflicts:
	IPtracker/.gitignore