Merge pull request #22 from elliottwilliams/master

Nitrous setup integration