add travis
fix tests for newer versions of django
potential fix for django 1.2 compatibility
fix tests in django 1.6
fix test runner to print expected AND actual
make the language a little more consistent and add tests
Merge branch 'refs/heads/travis'
bump version for release candidate
Merge branch 'master' of github.com:Rootbuzz/shpaml