diff -r f6f7196d27a5 -r a401c84170ba .hgignore
--- a/.hgignore	Wed May 14 22:00:33 2014 -0600
+++ b/.hgignore	Thu May 15 10:56:03 2014 -0700
@@ -11,9 +11,11 @@
 # IntelliJ files
 *.ipr
 *.iml
+*.eml
 *.iws
-.idea/misc.xml
-.idea/workspace.xml
+#.idea/misc.xml
+#.idea/workspace.xml
+.idea/*
 
 .AppleDouble
 .DS_Store
diff -r f6f7196d27a5 -r a401c84170ba .idea/.name
--- a/.idea/.name	Wed May 14 22:00:33 2014 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-jython27
\ No newline at end of file
diff -r f6f7196d27a5 -r a401c84170ba .idea/codeStyleSettings.xml
--- a/.idea/codeStyleSettings.xml	Wed May 14 22:00:33 2014 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="100" />
-        <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="100" />
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-        <codeStyleSettings language="JAVA">
-          <option name="IF_BRACE_FORCE" value="3" />
-          <option name="DOWHILE_BRACE_FORCE" value="3" />
-          <option name="WHILE_BRACE_FORCE" value="3" />
-          <option name="FOR_BRACE_FORCE" value="3" />
-          <indentOptions>
-            <option name="TAB_SIZE" value="8" />
-          </indentOptions>
-        </codeStyleSettings>
-      </value>
-    </option>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </component>
-</project>
-
diff -r f6f7196d27a5 -r a401c84170ba .idea/compiler.xml
--- a/.idea/compiler.xml	Wed May 14 22:00:33 2014 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="?*.properties" />
-      <entry name="?*.xml" />
-      <entry name="?*.gif" />
-      <entry name="?*.png" />
-      <entry name="?*.jpeg" />
-      <entry name="?*.jpg" />
-      <entry name="?*.html" />
-      <entry name="?*.dtd" />
-      <entry name="?*.tld" />
-      <entry name="?*.ftl" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
-  </component>
-</project>
-
diff -r f6f7196d27a5 -r a401c84170ba .idea/copyright/profiles_settings.xml
--- a/.idea/copyright/profiles_settings.xml	Wed May 14 22:00:33 2014 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff -r f6f7196d27a5 -r a401c84170ba .idea/encodings.xml
--- a/.idea/encodings.xml	Wed May 14 22:00:33 2014 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
-</project>
-
diff -r f6f7196d27a5 -r a401c84170ba .idea/libraries/extlibs.xml
--- a/.idea/libraries/extlibs.xml	Wed May 14 22:00:33 2014 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="extlibs">
-    <CLASSES>
-      <root url="file://$PROJECT_DIR$/extlibs" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-    <jarDirectory url="file://$PROJECT_DIR$/extlibs" recursive="false" />
-  </library>
-</component>
\ No newline at end of file
diff -r f6f7196d27a5 -r a401c84170ba .idea/libraries/extlibs2.xml
--- a/.idea/libraries/extlibs2.xml	Wed May 14 22:00:33 2014 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-<component name="libraryTable">
-  <library name="extlibs">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/extlibs/asm-util-4.0.jar!/" />
-      <root url="jar://$PROJECT_DIR$/extlibs/mysql-connector-java-5.1.6.jar!/" />
-      <root url="jar://$PROJECT_DIR$/extlibs/jffi-ppc64-Linux.jar!/" />
-      <root url="jar://$PROJECT_DIR$/extlibs/stringtemplate-3.2.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/extlibs/jarjar-0.7.jar!/" />
-      <root url="jar://$PROJECT_DIR$/extlibs/jffi-x86_64-Windows.jar!/" />
-      <root url="jar://$PROJECT_DIR$/extlibs/livetribe-jsr223-2.0.6.jar!/" />
-      <root url="jar://$PROJECT_DIR$/extlibs/jffi-i386-FreeBSD.jar!/" />
-      <root url="jar://$PROJECT_DIR$/extlibs/jffi.jar!/" />
-      <root url="jar://$PROJECT_DIR$/extlibs/antlr-3.1.3.jar!/" />
-      <root url="jar://$PROJECT_DIR$/extlibs/jffi-Darwin.jar!/" />
-      <root url="jar://$PROJECT_DIR$/extlibs/libreadline-java-0.8.jar!/" />
-      <root url="jar://$PROJECT_DIR$/extlibs/jffi-i386-OpenBSD.jar!/" />
-      <root url="jar://$PROJECT_DIR$/extlibs/jnr-netdb-0.4.jar!/" />
-      <root url="jar://$PROJECT_DIR$/extlibs/jffi-i386-Linux.jar!/" />
-      <root url="jar://$PROJECT_DIR$/extlibs/asm-commons-4.0.jar!/" />
-      <root url="jar://$PROJECT_DIR$/extlibs/profile.jar!/" />
-      <root url="jar://$PROJECT_DIR$/extlibs/jffi-s390x-Linux.jar!/" />
-      <root url="jar://$PROJECT_DIR$/extlibs/jffi-ppc-AIX.jar!/" />
-      <root url="jar://$PROJECT_DIR$/extlibs/antlr-runtime-3.1.3.jar!/" />
-      <root url="jar://$PROJECT_DIR$/extlibs/asm-4.0.jar!/" />
-      <root url="jar://$PROJECT_DIR$/extlibs/xercesImpl-2.11.0.jar!/" />
-      <root url="jar://$PROJECT_DIR$/extlibs/xml-apis-2.11.0.jar!/" />
-      <root url="jar://$PROJECT_DIR$/extlibs/servlet-api-2.5.jar!/" />
-      <root url="jar://$PROJECT_DIR$/extlibs/jnr-posix.jar!/" />
-      <root url="jar://$PROJECT_DIR$/extlibs/jffi-sparcv9-SunOS.jar!/" />
-      <root url="jar://$PROJECT_DIR$/extlibs/jffi-x86_64-OpenBSD.jar!/" />
-      <root url="jar://$PROJECT_DIR$/extlibs/antlr-2.7.7.jar!/" />
-      <root url="jar://$PROJECT_DIR$/extlibs/jffi-i386-SunOS.jar!/" />
-      <root url="jar://$PROJECT_DIR$/extlibs/jffi-i386-Windows.jar!/" />
-      <root url="jar://$PROJECT_DIR$/extlibs/jffi-x86_64-SunOS.jar!/" />
-      <root url="jar://$PROJECT_DIR$/extlibs/jline-1.0.jar!/" />
-      <root url="jar://$PROJECT_DIR$/extlibs/jffi-ppc-Linux.jar!/" />
-      <root url="jar://$PROJECT_DIR$/extlibs/jffi-x86_64-Linux.jar!/" />
-      <root url="jar://$PROJECT_DIR$/extlibs/jffi-x86_64-FreeBSD.jar!/" />
-      <root url="jar://$PROJECT_DIR$/extlibs/postgresql-8.3-603.jdbc4.jar!/" />
-      <root url="jar://$PROJECT_DIR$/extlibs/jffi-sparc-SunOS.jar!/" />
-      <root url="jar://$PROJECT_DIR$/extlibs/junit-4.10.jar!/" />
-      <root url="jar://$PROJECT_DIR$/extlibs/guava-13.0.1.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff -r f6f7196d27a5 -r a401c84170ba .idea/libraries/jar.xml
--- a/.idea/libraries/jar.xml	Wed May 14 22:00:33 2014 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="jar">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/extlibs/mockrunner-0.4.1/jar/jdom.jar!/" />
-      <root url="jar://$PROJECT_DIR$/extlibs/mockrunner-0.4.1/jar/commons-logging-1.0.4.jar!/" />
-      <root url="jar://$PROJECT_DIR$/extlibs/mockrunner-0.4.1/jar/jakarta-oro-2.0.8.jar!/" />
-      <root url="jar://$PROJECT_DIR$/extlibs/mockrunner-0.4.1/jar/nekohtml.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff -r f6f7196d27a5 -r a401c84170ba .idea/libraries/svnant_jars.xml
--- a/.idea/libraries/svnant_jars.xml	Wed May 14 22:00:33 2014 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="svnant-jars">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/extlibs/svnant-jars/svnClientAdapter.jar!/" />
-      <root url="jar://$PROJECT_DIR$/extlibs/svnant-jars/svnant.jar!/" />
-      <root url="jar://$PROJECT_DIR$/extlibs/svnant-jars/svnjavahl.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff -r f6f7196d27a5 -r a401c84170ba .idea/libraries/test.xml
--- a/.idea/libraries/test.xml	Wed May 14 22:00:33 2014 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-<component name="libraryTable">
-  <library name="test">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/Lib/test/bug1239.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Lib/test/bug1373.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Lib/test/classimport_Lib.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Lib/test/classimport.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Lib/test/syspath_import.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Lib/test/blob.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff -r f6f7196d27a5 -r a401c84170ba .idea/modules.xml
--- a/.idea/modules.xml	Wed May 14 22:00:33 2014 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/Jython27.iml" filepath="$PROJECT_DIR$/Jython27.iml" />
-    </modules>
-  </component>
-</project>
-
diff -r f6f7196d27a5 -r a401c84170ba .idea/scopes/scope_settings.xml
--- a/.idea/scopes/scope_settings.xml	Wed May 14 22:00:33 2014 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file
diff -r f6f7196d27a5 -r a401c84170ba .idea/uiDesigner.xml
--- a/.idea/uiDesigner.xml	Wed May 14 22:00:33 2014 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
-
diff -r f6f7196d27a5 -r a401c84170ba .idea/vcs.xml
--- a/.idea/vcs.xml	Wed May 14 22:00:33 2014 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="hg4idea" />
-  </component>
-</project>
-
diff -r f6f7196d27a5 -r a401c84170ba Jython27.iml
--- a/Jython27.iml	Wed May 14 22:00:33 2014 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/extlibs/mockrunner-0.4.1/jar/j2ee1.3/servlet.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="library" name="extlibs" level="project" />
-  </component>
-</module>
-