Cleaned up a few things and fixed travis badge