Messed up merge a little. Travis has to pass now