Bunch of changes that are probably gonna
Be overwritten since switch to OSM
Merge branch 'master' of github.com:jpulec/planit

Conflicts:
	planit/apps/gatherer/tasks.py
	planit/apps/planner/views.py
	planit/templates/planner/results.html