Rebase from master -

Includes Travis integration