Fixed redirects in qraat_auth/views.py; fixed login redirect to include form data (if any) from original URL
Fixed position queries to order by timestamp; Added Flot axis labels instead of plot title
Merge branch 'master' of http://github.com/qraat/qraat into catchHttpErrors
Merge branch 'master' of http://github.com/qraat/qraat into catchHttpErrors
Changed Flot plot from lines to points; fixed small bug with display of login form
Dealt with duplicates in map/Flot data by choosing highest likelihood position for each timestamp; changed method for position ordering
Merge branch 'catchHttpErrors', remote-tracking branch 'origin' into catchHttpErrors
Merge remote-tracking branch 'origin/catchHttpErrors' into catchHttpErrors