getting ready for travis ci
Merge branch 'dev' of github.com:Canadensys/canadensys-data-access into dev