Check if database table "users" exists.
Merge pull request #14 from johnjohndoe/handle-missing-user-table

Check if database table "users" exists.
Describe how to import from folders and files.
Merge pull request #15 from johnjohndoe/describe-import-options

Describe how to import from folders and files.
Fix errors criticized by pep8.
Merge pull request #16 from johnjohndoe/fix-python-style-guide-errors

Fix errors criticized by pep8.
Fix typo in command-line option
Mention dependencies in README
Update pytest to version 2.5.2
Fix pep8 style errors
Merge branch 'master' into features/separateupdatelocs

Conflicts:
	bin/gpx2spatialite