slight cleanup of javascript files and adding in Mixpanel for testing
rm pic from git
fixed merge issues