Add new file to gitignore

In order to track bin/gpx2spatialite_updatelocs
New separate script to update locations

Proposal to move updating locations out of core gpx2spatialite script
and into a separate script. Adds a new method for updating all locations
which is much quicker than the existing method but which will not work
for partial updates of e.g. all unknowns
Take update_locs option out of script

Move this function to separate script in bin/gpx2spatialite_updatelocs
Take update_locations out of db.py

Update locations now handled by separate script in bin/gpx2spatialite_updatelocs
Fix typo in command-line option
Mention dependencies in README
Update pytest to version 2.5.2
Fix pep8 style errors
Help comment change

Lose indentation - makes print out look odd
Merge branch 'master' into features/separateupdatelocs

Conflicts:
	bin/gpx2spatialite
Document updatelocs in README

Updated and revised the citydefs section of the README file to reflect
changing updatelocs to a separate script and the addition of the
--all-locations option. Included explanation of citydefs.
Minor rst formatting change

Understanding inline hyperlinks in rst.
Merge pull request #17 from belasco/features/separateupdatelocs

Features/separateupdatelocs
Simplify gpx2spatialite_updatelocs script and minor fixes.
Rename function parameter
Formatting
Rename get_locations -> get_cityid_trackpoint_pairs
Add unit test for get_cityid_trackpoint_pairs
Use partial function in test_db