120 files changed, 4308 insertions, 5129 deletions

diff --git a/.gitignore b/.gitignore
index eaaa4ed5..63f71195 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 *.pyc
 *~
 *.bc
+src/relooper*.js
 
 # Ignore generated files 
 src/relooper.js
diff --git a/AUTHORS b/AUTHORS
index c1f93e2c..04dfc10d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -42,4 +42,6 @@ a license to everyone to use it as detailed in LICENSE.)
 * Manuel Wellmann <manuel.wellmann@autodesk.com> (copyright owned by Autodesk, Inc.)
 * Xuejie Xiao <xxuejie@gmail.com>
 * Dominic Wong <dom@slowbunyip.org>
+* Alan Kligman <alan.kligman@gmail.com> (copyright owned by Mozilla Foundation)
 * Anthony Liot <wolfviking0@yahoo.com>
+
diff --git a/em++ b/em++
index be2ed37b..ba09e1a2 100755
--- a/em++
+++ b/em++
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 '''
 See emcc.py. This script forwards to there, noting that we want C++ and not C by default
@@ -8,5 +8,5 @@ import os, subprocess, sys
 from tools im