Merge pull request #3 from nlblunt/development

Development
Merge pull request #4 from nlblunt/development

Travis CI support
Merge pull request #5 from nlblunt/development

Development
Artist Controller Spec