fixed w/a swap, screen offset
Merge branch 'master' of https://github.com/lrsjohnson/simmonscpw2013

Conflicts:
	tours/views.py