Grimley517 issue1

Made travis work, in wrong branch