Added travis config
Added travis and pypip badges
Added Django 1.5 and 1.6 to travis config, removed Django 1.2
Another tiny README fix
Merge remote-tracking branch 'upstream/master'