Cleanup

Need to add travis tests, and resolve some potential issues under 2.0.