changes framework search path to work for distribution
cleans up old paths
fix path to opentok.bundle
resolving merge conflicts