Expand readme
integrate pytest
testing new pytest settings
add coveralls
fix travis
Merge remote-tracking branch 'upstream/master' into testing
mark test_get_ambassadors_for_country as failing
Merge pull request #271 from naisnouk/master

test for approve/reject event
update readme
update readme
Merge pull request #272 from gandalfar/testing

Improved testing with pytest
using get_or_create when testing for group membership
add note about test that has to be fixed
make sure address updates on paste

Also made sure the country updates when the marker is being manually marked and fixed a few other smaller issues related to that.
refactoring and making the events.js code more readable

Getting read of some unused variables, making variable names more readable.
Merge pull request #273 from ialja/master

using get_or_create when testing for group membership
Fix pytest South migrations, removed workaround for ambassadors test
bump travis
use pytest_django from master branch for now
Revert "bump travis"

This reverts commit 6ad4647f350bf7065cf364624696dfbd941d4b15.