added js and mailchimp
got rid of weird clone folder
changed social width to 63
added mailing list and jsMerge remote-tracking branch 'origin/aurooba' into bobbi