Cleaned up code, bug fixes and travis / read me stuff, etc.