Merge branch 'develop'
Merge pull request #6 from kerryknight/develop

Updated querying methods to nil query on completion;
Merge branch 'develop'
Update .travis.yml
Update .travis.yml
Update .travis.yml
Updates to fix some compiler warnings
Merge branch 'master' into develop
Merge branch 'master' into develop