Regex, travis and make fixes