Small tweaks for a better setuptools experience.
Using Conda for Travis CI testing.
Make sure Iris works in the CI tests.
Removed old test script.
Merge pull request #36 from ajdawson/test-cleanup

Test cleanup
Merge pull request #35 from ajdawson/setuptools-improvements

Small tweaks for a better setuptools experience.
Updated the dates in license headers.
Merge pull request #37 from ajdawson/license-dates

License dates
Corrected code block in documentation.
REL - version 1.3.1.
REL- revert version number on maintenance branch.
Merge branch 'v1.3.x'

* v1.3.x:
  REL- revert version number on maintenance branch.
  REL - version 1.3.1.
  Corrected code block in documentation.
  Updated the dates in license headers.
  Removed old test script.
  Make sure Iris works in the CI tests.
  Using Conda for Travis CI testing.
  Small tweaks for a better setuptools experience.

Conflicts:
	.travis.yml
	README.md