Fixed static rosie cassettes
Updated assets gem and cleaned up conflict-riddled lock file
Updated travis file