added GA and MailChimp form
Merge branch 'master' of heroku.com:gearheadworkspace
reorganized a bunch of files