Closes #12, fixes Travis config