Merge pull request #849 from timlinux/master

Merge changes from develop ready for 2.0.2 release
Merge pull request #850 from timlinux/master

Fixes for running tests on ubuntu 13.10 64 bit
Merge pull request #851 from timlinux/master

Use small plugin icon
Merge pull request #852 from timlinux/master

Use inasafe email for contact
Fixed typo in email address
Merge remote-tracking branch 'origin'