Fixed error with filepath location so Travis will test code appropriately.
Merge remote-tracking branch 'origin/dev' into dev