Updating @markwilson's email in the travis build file
Updating licenses to be 2014
Merge pull request #126 from tickit-project/hotfix/update-license-2014

Updating licenses to be 2014
Merging upstream master