diff --git a/.gitignore b/.gitignore
index 86043d16..aeda64a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,10 @@
 .DS_Store
 *.pyc
+*.so
 build/
+cache/
 dist/
+dist-*
 app/deps/Sparkle*
 
 # cds garbage
@@ -12,3 +15,5 @@ test.py
 # Xcode user files
 project.xcworkspace
 xcuserdata
+DerivedData/
+Xcode/
diff --git a/PlotDevice.xcodeproj/project.pbxproj b/PlotDevice.xcodeproj/project.pbxproj
index 932929b3..947e77c2 100644
--- a/PlotDevice.xcodeproj/project.pbxproj
+++ b/PlotDevice.xcodeproj/project.pbxproj
@@ -19,13 +19,12 @@
 		2A66ECEF18A99328002903DE /* underscore-1.5.2.min.js in Copy Editor Scripts */ = {isa = PBXBuildFile; fileRef = 2A66ECE218A992BD002903DE /* underscore-1.5.2.min.js */; };
 		2A7AF5C818D2AFAA00F8FFC2 /* examples in Resources */ = {isa = PBXBuildFile; fileRef = 2A7AF5C718D2AFAA00F8FFC2 /* examples */; };
 		2A93AE751903326E00C6144D /* placeholder.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 2A93AE731903326E00C6144D /* placeholder.pdf */; };
-		2AA40EBF184BF9CB00981ADC /* libpython2.7.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2AA40EBE184BF9CB00981ADC /* libpython2.7.dylib */; };
 		2ABBB2FA1854018B001C4E0A /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2ABBB2F91854018B001C4E0A /* AVFoundation.framework */; };
 		2ABBB2FC18540246001C4E0A /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2ABBB2FB18540246001C4E0A /* CoreVideo.framework */; };
 		2ABBB2FE185402AC001C4E0A /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2ABBB2FD185402AC001C4E0A /* CoreMedia.framework */; };
 		2ABDB76B1867D8160069EFC3 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 2ABDB7681867D8160069EFC3 /* main.m */; };
 		2ABDB76E1867D8BB0069EFC3 /* plotdevice-app.py in Resources */ = {isa = PBXBuildFile; fileRef = 2ABDB7671867D8160069EFC3 /* plotdevice-app.py */; };
-		2ABDB7741867D9970069EFC3 /* plotdevice in Copy 'plotdevice' Tool */ = {isa = PBXBuildFile; fileRef = 2ABDB7721867D9920069EFC3 /* plotdevice */; };
+		2ABDB7741867D9970069EFC3 /* plotdevice in Copy 'plotdevice' and 'bplotdevice' Tools */ = {isa = PBXBuildFile; fileRef = 2ABDB7721867D9920069EFC3 /* plotdevice */; };
 		611CC49810BA8B9E00B55455 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 611CC48110BA8B9E00B55455 /* Credits.rtf */; };
 		611CC49C10BA8B9E00B55455 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 611CC48910BA8B9E00B55455 /* InfoPlist.strings */; };
 		611CC4A110BA8B9E00B55455 /* PlotDevice.icns in Resources */ = {isa = PBXBuildFile; fileRef = 611CC49310BA8B9E00B55455 /* PlotDevice.icns */; };
@@ -37,6 +36,10 @@
 		6155D9F413E2B79E00675A92 /* CHANGES.md in Resources */ = {isa = PBXBuildFile; fileRef = 6155D9F213E2B79E00675A92 /* CHANGES.md */; };
 		6155D9F513E2B79E00675A92 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 6155D9F313E2B79E00675A92 /* README.md */; };
 		8D15AC340486D014006FF6A4 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A7FEA54F5311CA2CBB /* Cocoa.framework */; };
+		CF0CB1E21975B76A00511DC8 /* plotdevice-term.py in Resources */ = {isa = PBXBuildFile; fileRef = CF0CB1E11975B76A00511DC8 /* plotdevice-term.py */; };
+		CFA6011D1977493700D8E07B /* bplotdevice in Resources */ = {isa = PBXBuildFile; fileRef = CFA6011C1977493700D8E07B /* bplotdevice */; };
+		CFA6011E1977494500D8E07B /* bplotdevice in Copy 'plotdevice' and 'bplotdevice' Tools */ = {isa = PBXBuildFile; fileRef = CFA6011C1977493700D8E07B /* bplotdevice */; };
+		CFF01E861979B49F00907EEA /* Python in Frameworks */ = {isa = PBXBuildFile; fileRef = CFF01E851979B49F00907EEA /* Python */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -68,15 +71,16 @@
 			name = "Copy Editor Scripts";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		2ABDB76F1867D9560069EFC3 /* Copy 'plotdevice' Tool */ = {
+		2ABDB76F1867D9560069EFC3 /* Copy 'plotdevice' and 'bplotdevice' Tools */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
 			dstPath = "";
 			dstSubfolderSpec = 12;
 			files = (
-				2ABDB7741867D9970069EFC3 /* plotdevice in Copy 'plotdevice' Tool */,
+				CFA6011E1977494500D8E07B /* bplotdevice in Copy 'plotdevice' and 'bplotdevice' Tools */,
+				2ABDB7741867D9970069EFC3 /* plotdevice in Copy 'plotdevice' and 'bplotdevice' Tools */,
 			);
-			name = "Copy 'plotdevice' Tool";
+			name = "Copy 'plotdevice' and 'bplotdevice' Tools";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXCopyFilesBuildPhase section */
@@ -94,7 +98,6 @@
 		2A294467185E575F00E9F650 /* document.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = document.py; sourceTree = "<group>"; };
 		2A294468185E575F00E9F650 /* preferences.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = preferences.py; sourceTree = "<group>"; };
 		2A32957218C59D0A00EEDD1C /* __init__.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = __init__.py; sourceTree = "<group>"; };
-		2A32957418C59D0A00EEDD1C /* fsevents.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = fsevents.py; sourceTree = "<group>"; };
 		2A32957518C59D0A00EEDD1C /* geometry.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = geometry.py; sourceTree = "<group>"; };
 		2A32957718C59D0A00EEDD1C /* io.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = io.py; sourceTree = "<group>"; };
 		2A32957918C59D0A00EEDD1C /* pathmatics.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = pathmatics.py; sourceTree = "<group>"; };
@@ -110,7 +113,6 @@
 		2A7AF5C718D2AFAA00F8FFC2 /* examples */ = {isa = PBXFileReference; lastKnownFileType = folder; path = examples; sourceTree = "<group>"; };
 		2A827CC91859E9FE00A126BA /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		2A93AE741903326E00C6144D /* English */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = English; path = Resources/English.lproj/placeholder.pdf; sourceTree = "<group>"; };
-		2AA40EBE184BF9CB00981ADC /* libpython2.7.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libpython2.7.dylib; path = ../../../../../../usr/lib/libpython2.7.dylib; sourceTree = "<group>"; };
 		2ABBB2F91854018B001C4E0A /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
 		2ABBB2FB18540246001C4E0A /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; };
 		2ABBB2FD185402AC001C4E0A /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; };
@@ -118,7 +120,7 @@
 		2ABDB7681867D8160069EFC3 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = app/main.m; sourceTree = "<group>"; };
 		2ABDB7691867D8160069EFC3 /* PlotDevice_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PlotDevice_Prefix.pch; path = app/PlotDevice_Prefix.pch; sourceTree = "<group>"; };
 		2ABDB76C1867D8210069EFC3 /* PlotDevice-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "PlotDevice-Info.plist"; sourceTree = "<group>"; };
-		2ABDB7721867D9920069EFC3 /* plotdevice */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = plotdevice; path = app/plotdevice; sourceTree = "<group>"; };
+		2ABDB7721867D9920069EFC3 /* plotdevice */ = {isa = PBXFileReference; explicitFileType = text.script.python; fileEncoding = 4; name = plotdevice; path = app/plotdevice; sourceTree = "<group>"; };
 		2ABDB7751867EB520069EFC3 /* app.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = app.py; sourceTree = "<group>"; };
 		2ABDB7761867EB520069EFC3 /* views.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = views.py; sourceTree = "<group>"; };
 		2AC07CB618EF8E7D00B75879 /* __init__.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = __init__.py; sourceTree = "<group>"; };
@@ -142,8 +144,6 @@
 		611CC49310BA8B9E00B55455 /* PlotDevice.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = PlotDevice.icns; path = Resources/PlotDevice.icns; sourceTree = "<group>"; };
 		611CC49410BA8B9E00B55455 /* PlotDeviceFile.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = PlotDeviceFile.icns; path = Resources/PlotDeviceFile.icns; sourceTree = "<group>"; };
 		611CC4AF10BA8C1B00B55455 /* __init__.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = __init__.py; sourceTree = "<group>"; };
-		611CC4BB10BA8C1B00B55455 /* __init__.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = __init__.py; sourceTree = "<group>"; };
-		611CC4BC10BA8C1B00B55455 /* pathmatics.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = pathmatics.py; sourceTree = "<group>"; };
 		611CC4D710BA8C1B00B55455 /* __init__.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = __init__.py; sourceTree = "<group>"; };
 		611CC4D910BA8C1B00B55455 /* kgp.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = kgp.py; sourceTree = "<group>"; };
 		611CC4DA10BA8C1B00B55455 /* ottobot.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = ottobot.py; sourceTree = "<group>"; };
@@ -154,6 +154,14 @@
 		6155D9F213E2B79E00675A92 /* CHANGES.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CHANGES.md; sourceTree = "<group>"; };
 		6155D9F313E2B79E00675A92 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.md; sourceTree = "<group>"; };
 		8D15AC370486D014006FF6A4 /* PlotDevice.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PlotDevice.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		CF0CB1E11975B76A00511DC8 /* plotdevice-term.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = "plotdevice-term.py"; path = "app/plotdevice-term.py"; sourceTree = "<group>"; };
+		CF1C6CCE1975E87800C6C330 /* load-cache.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "load-cache.sh"; sourceTree = "<group>"; };
+		CF1C6CCF1975E87800C6C330 /* required-wheels.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "required-wheels.txt"; sourceTree = "<group>"; };
+		CF61A9FF196DF61600BDFF1D /* relpath.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = relpath.sh; sourceTree = "<group>"; };
+		CFA6011C1977493700D8E07B /* bplotdevice */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = bplotdevice; path = app/bplotdevice; sourceTree = "<group>"; };
+		CFC5106C197545210046C918 /* urlcache.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = urlcache.sh; sourceTree = "<group>"; };
+		CFC5106D197545210046C918 /* download.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = download.sh; sourceTree = "<group>"; };
+		CFF01E851979B49F00907EEA /* Python */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = Python; path = /System/Library/Frameworks/Python.framework/Versions/2.7/Python; sourceTree = "<absolute>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -161,7 +169,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				2AA40EBF184BF9CB00981ADC /* libpython2.7.dylib in Frameworks */,
+				CFF01E861979B49F00907EEA /* Python in Frameworks */,
 				2ABBB2FC18540246001C4E0A /* CoreVideo.framework in Frameworks */,
 				2ABBB2FE185402AC001C4E0A /* CoreMedia.framework in Frameworks */,
 				2ABBB2FA1854018B001C4E0A /* AVFoundation.framework in Frameworks */,
@@ -177,7 +185,6 @@
 		1058C7A6FEA54F5311CA2CBB /* Linked Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				2AA40EBE184BF9CB00981ADC /* libpython2.7.dylib */,
 				1058C7A7FEA54F5311CA2CBB /* Cocoa.framework */,
 			);
 			name = "Linked Frameworks";
@@ -199,7 +206,7 @@
 				8D15AC370486D014006FF6A4 /* PlotDevice.app */,
 			);
 			name = Products;
-			sourceTree = "<group>";
+			sourceTree = SOURCE_ROOT;
 		};
 		2A15C44018A20971006BDFF0 /* ui */ = {
 			isa = PBXGroup;
@@ -226,7 +233,6 @@
 			isa = PBXGroup;
 			children = (
 				2A32957218C59D0A00EEDD1C /* __init__.py */,
-				2A32957418C59D0A00EEDD1C /* fsevents.py */,
 				2A32957518C59D0A00EEDD1C /* geometry.py */,
 				2A32957718C59D0A00EEDD1C /* io.py */,
 				2A32957918C59D0A00EEDD1C /* pathmatics.py */,
@@ -242,6 +248,7 @@
 				611CC4AE10BA8C1B00B55455 /* plotdevice */,
 				2A37F4AFFDCFA73011CA2CEA /* Other Sources */,
 				2A37F4B8FDCFA73011CA2CEA /* Resources */,
+				CF61A9FC196DF5DC00BDFF1D /* etc */,
 				2A7AF5C718D2AFAA00F8FFC2 /* examples */,
 				2A64AB46195F4E78001E4E69 /* deps */,
 				2A37F4C3FDCFA73011CA2CEA /* Frameworks */,
@@ -253,6 +260,8 @@
 		2A37F4AFFDCFA73011CA2CEA /* Other Sources */ = {
 			isa = PBXGroup;
 			children = (
+				CFA6011C1977493700D8E07B /* bplotdevice */,
+				CF0CB1E11975B76A00511DC8 /* plotdevice-term.py */,
 				2ABDB7671867D8160069EFC3 /* plotdevice-app.py */,
 				2ABDB7681867D8160069EFC3 /* main.m */,
 				2ABDB7691867D8160069EFC3 /* PlotDevice_Prefix.pch */,
@@ -284,6 +293,7 @@
 		2A37F4C3FDCFA73011CA2CEA /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				CFF01E851979B49F00907EEA /* Python */,
 				2AEE843D18B5603900CF91D4 /* CoreText.framework */,
 				2A15C42C18A1FA14006BDFF0 /* WebKit.framework */,
 				2A591FEF185C17D200D1833D /* Security.framework */,
@@ -331,7 +341,6 @@
 				2AC07CD818EF8EC500B75879 /* context.py */,
 				2AC07CB518EF8E7D00B75879 /* gfx */,
 				2A32957118C59D0A00EEDD1C /* lib */,
-				611CC4BA10BA8C1B00B55455 /* geo */,
 				611CC4C410BA8C1B00B55455 /* gui */,
 				2A294457185E539400E9F650 /* run */,
 				611CC4D610BA8C1B00B55455 /* util */,
@@ -339,15 +348,6 @@
 			path = plotdevice;
 			sourceTree = "<group>";
 		};
-		611CC4BA10BA8C1B00B55455 /* geo */ = {
-			isa = PBXGroup;
-			children = (
-				611CC4BB10BA8C1B00B55455 /* __init__.py */,
-				611CC4BC10BA8C1B00B55455 /* pathmatics.py */,
-			);
-			path = geo;
-			sourceTree = "<group>";
-		};
 		611CC4C410BA8C1B00B55455 /* gui */ = {
 			isa = PBXGroup;
 			children = (
@@ -374,6 +374,18 @@
 			path = util;
 			sourceTree = "<group>";
 		};
+		CF61A9FC196DF5DC00BDFF1D /* etc */ = {
+			isa = PBXGroup;
+			children = (
+				CF1C6CCE1975E87800C6C330 /* load-cache.sh */,
+				CF1C6CCF1975E87800C6C330 /* required-wheels.txt */,
+				CFC5106C197545210046C918 /* urlcache.sh */,
+				CFC5106D197545210046C918 /* download.sh */,
+				CF61A9FF196DF61600BDFF1D /* relpath.sh */,
+			);
+			path = etc;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -385,9 +397,10 @@
 				2A15C43718A20929006BDFF0 /* Copy Editor Assets */,
 				2A66ECEA18A99303002903DE /* Copy Editor Scripts */,
 				2A758E411957B7CE003ECF9D /* Copy PlotDevice Module */,
-				2ABDB76F1867D9560069EFC3 /* Copy 'plotdevice' Tool */,
+				2ABDB76F1867D9560069EFC3 /* Copy 'plotdevice' and 'bplotdevice' Tools */,
 				8D15AC300486D014006FF6A4 /* Sources */,
 				8D15AC330486D014006FF6A4 /* Frameworks */,
+				CFC51073197545B90046C918 /* Install Wheelhouse Packages to App Bundle */,
 			);
 			buildRules = (
 			);
@@ -433,6 +446,7 @@
 				2ABDB76E1867D8BB0069EFC3 /* plotdevice-app.py in Resources */,
 				611CC49810BA8B9E00B55455 /* Credits.rtf in Resources */,
 				611CC49C10BA8B9E00B55455 /* InfoPlist.strings in Resources */,
+				CF0CB1E21975B76A00511DC8 /* plotdevice-term.py in Resources */,
 				611CC4A110BA8B9E00B55455 /* PlotDevice.icns in Resources */,
 				2A93AE751903326E00C6144D /* placeholder.pdf in Resources */,
 				611CC4A210BA8B9E00B55455 /* PlotDeviceFile.icns in Resources */,
@@ -440,6 +454,7 @@
 				611CC5A810BA919A00B55455 /* PlotDevicePreferences.xib in Resources */,
 				611CC68010BAA08300B55455 /* MainMenu.xib in Resources */,
 				611CC68710BAA0A600B55455 /* AskString.xib in Resources */,
+				CFA6011D1977493700D8E07B /* bplotdevice in Resources */,
 				2A7AF5C818D2AFAA00F8FFC2 /* examples in Resources */,
 				6155D9F413E2B79E00675A92 /* CHANGES.md in Resources */,
 				6155D9F513E2B79E00675A92 /* README.md in Resources */,
@@ -461,7 +476,23 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "# let the setup script handle updating\n/usr/bin/python setup.py build\n\n# copy the up-to-date module contents into the app bundle\nEXT_DIR=\"$TARGET_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/python/\"\nmkdir -p $EXT_DIR\nditto build/lib/plotdevice \"$EXT_DIR/plotdevice\"\n\n# make sure everything has a .pyc (so code-signing doesn't break on first run)\n/usr/bin/python -m compileall \"$EXT_DIR/plotdevice\"";
+			shellScript = "python=\"/usr/bin/python\"\nif [ -x /usr/local/bin/python ]; then\n    python=\"/usr/local/bin/python\"\nfi\n\n# let the setup script handle updating\neval \"${python} setup.py build\"\n\n# copy the up-to-date module contents into the app bundle\nEXT_DIR=\"$TARGET_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/python/\"\nmkdir -p $EXT_DIR\nditto build/lib/plotdevice \"$EXT_DIR/plotdevice\"\n\n# make sure everything has a .pyc (so code-signing doesn't break on first run)\neval \"${python} -m compileall ${EXT_DIR}/plotdevice\"";
+			showEnvVarsInLog = 0;
+		};
+		CFC51073197545B90046C918 /* Install Wheelhouse Packages to App Bundle */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Install Wheelhouse Packages to App Bundle";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "python=\"/usr/bin/python\"\nif [ -x /usr/local/bin/python ]; then\npython=\"/usr/local/bin/python\"\nfi\n\n# let the setup script handle wheelhousing\neval \"${python} setup.py wheelhouse\"\n";
+			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -549,10 +580,13 @@
 		C05733C808A9546B00998B17 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
+				ALWAYS_SEARCH_USER_PATHS = YES;
 				COMBINE_HIDPI_IMAGES = YES;
-				CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)";
+				CONFIGURATION_BUILD_DIR = dist;
 				COPY_PHASE_STRIP = NO;
+				DEPLOYMENT_LOCATION = NO;
+				DEPLOYMENT_POSTPROCESSING = NO;
+				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_MODEL_TUNING = G5;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -561,58 +595,77 @@
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
-					/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7,
+					/usr/include/python2.7,
 				);
 				INFOPLIST_FILE = "app/PlotDevice-Info.plist";
 				INSTALL_PATH = /Applications;
-				LIBRARY_SEARCH_PATHS = /System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/config;
+				LIBRARY_SEARCH_PATHS = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Python.framework/Versions/2.7";
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
-				ONLY_ACTIVE_ARCH = NO;
+				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "";
 				PRODUCT_NAME = PlotDevice;
 				SDKROOT = macosx;
+				VALID_ARCHS = x86_64;
 			};
 			name = Debug;
 		};
 		C05733C908A9546B00998B17 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
+				ALWAYS_SEARCH_USER_PATHS = YES;
 				COMBINE_HIDPI_IMAGES = YES;
 				CONFIGURATION_BUILD_DIR = dist;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEPLOYMENT_LOCATION = NO;
+				DEPLOYMENT_POSTPROCESSING = NO;
+				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = app/PlotDevice_Prefix.pch;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
-					/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7,
+					/usr/include/python2.7,
 				);
 				INFOPLIST_FILE = "app/PlotDevice-Info.plist";
 				INSTALL_PATH = /Applications;
-				LIBRARY_SEARCH_PATHS = /System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/config;
+				LIBRARY_SEARCH_PATHS = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Python.framework/Versions/2.7";
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
+				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "";
 				PRODUCT_NAME = PlotDevice;
 				SDKROOT = macosx;
+				VALID_ARCHS = x86_64;
 			};
 			name = Release;
 		};
 		C05733CC08A9546B00998B17 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				COPY_PHASE_STRIP = NO;
+				"DEBUG_INFORMATION_FORMAT[sdk=*]" = "";
+				FRAMEWORK_SEARCH_PATHS = "";
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_NAME = PlotDevice;
+				SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
+				STRIP_INSTALLED_PRODUCT = NO;
+				VALID_ARCHS = x86_64;
+				"VALID_ARCHS[sdk=*]" = x86_64;
 			};
 			name = Debug;
 		};
 		C05733CD08A9546B00998B17 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				"DEBUG_INFORMATION_FORMAT[sdk=*]" = "";
+				FRAMEWORK_SEARCH_PATHS = "";
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
+				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_NAME = PlotDevice;
+				SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
+				VALID_ARCHS = x86_64;
+				"VALID_ARCHS[sdk=*]" = x86_64;
 			};
 			name = Release;
 		};
diff --git a/app/PlotDevice_Prefix.pch b/app/PlotDevice_Prefix.pch
index f29f26f6..bdbe44d5 100644
--- a/app/PlotDevice_Prefix.pch
+++ b/app/PlotDevice_Prefix.pch
@@ -5,3 +5,7 @@
 #ifdef __OBJC__
     #import <Cocoa/Cocoa.h>
 #endif
+
+#ifndef PLOTDEVICE_PYTHON
+    #define PLOTDEVICE_PYTHON "/usr/bin/python"
+#endif
diff --git a/app/Resources/English.lproj/MainMenu.xib b/app/Resources/English.lproj/MainMenu.xib
index 91e0ae34..39d6fd11 100644
--- a/app/Resources/English.lproj/MainMenu.xib
+++ b/app/Resources/English.lproj/MainMenu.xib
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="13D65" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="13E28" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
         <deployment version="1090" defaultVersion="1090" identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5056"/>
@@ -441,6 +441,12 @@ CQ
                             <menuItem title="Adjust Color" hidden="YES" keyEquivalent="k" id="b2K-9m-mWk"/>
                             <menuItem title="Adjust Number" hidden="YES" keyEquivalent="K" id="SOC-pz-nRf"/>
                             <menuItem title="Lookup in Manual" hidden="YES" keyEquivalent="'" id="yXE-1P-kku"/>
+                            <menuItem isSeparatorItem="YES" id="jwz-Qv-xcq"/>
+                            <menuItem title="Open Terminal..." keyEquivalent="t" id="Tln-o0-uja">
+                                <connections>
+                                    <action selector="openTerminal:" target="-1" id="AUP-cP-MLV"/>
+                                </connections>
+                            </menuItem>
                         </items>
                     </menu>
                 </menuItem>
diff --git a/app/bplotdevice b/app/bplotdevice
new file mode 100755
index 00000000..93e5646f
--- /dev/null
+++ b/app/bplotdevice
@@ -0,0 +1,4 @@
+#!/usr/bin/python
+import sys
+from bpython.cli import main
+sys.exit(main())
\ No newline at end of file
diff --git a/app/deps/IO/setup.py b/app/deps/IO/setup.py
index 333c678c..5190fa77 100644
--- a/app/deps/IO/setup.py
+++ b/app/deps/IO/setup.py
@@ -1,12 +1,27 @@
-# from distutils.core import setup, Extension
 from setuptools import setup, find_packages
 from setuptools.extension import Extension
 
-quiet = {"extra_compile_args":['-Qunused-arguments']}
-cIO = Extension('cIO', sources=['module.m', 'SysAdmin.m', 'Pages.m', 'AnimatedGif.m', 'Video.m'], extra_link_args=['-framework', 'AppKit', '-framework', 'Foundation', '-framework', 'Quartz', '-framework', 'Security', '-framework', 'AVFoundation', '-framework', 'CoreMedia', '-framework', 'CoreVideo'], **quiet)
+quiet = { "extra_compile_args": ['-Qunused-arguments'] }
 
-setup (name = "cIO",
-       version = "1.0",
-       author = "Christian Swinehart",
-       description = "Image and video export routines.",
-       ext_modules = [cIO])
\ No newline at end of file
+cIO = Extension('cIO',
+    sources=[
+        'module.m',
+        'SysAdmin.m',
+        'Pages.m',
+        'AnimatedGif.m',
+        'Video.m'],
+    extra_link_args=[
+        '-framework', 'AppKit',
+        '-framework', 'Foundation',
+        '-framework', 'Quartz',
+        '-framework', 'Security',
+        '-framework', 'AVFoundation',
+        '-framework', 'CoreMedia',
+        '-framework', 'CoreVideo'],
+    **quiet)
+
+setup(name="cIO",
+    version="1.0",
+    author="Christian Swinehart",
+    description="Image and video export routines.",
+    ext_modules=[cIO])
\ No newline at end of file
diff --git a/app/deps/geometry/setup.py b/app/deps/geometry/setup.py
index 279131cf..b057f823 100644
--- a/app/deps/geometry/setup.py
+++ b/app/deps/geometry/setup.py
@@ -1,12 +1,13 @@
-# from distutils.core import setup, Extension
 from setuptools import setup, find_packages
 from setuptools.extension import Extension
 
-quiet = {"extra_compile_args":['-Qunused-arguments']}
-cGeometry = Extension("cGeometry", ["cGeometry.c"], **quiet)
+quiet = { "extra_compile_args": ['-Qunused-arguments'] }
+cGeometry = Extension("cGeometry",
+    sources=["cGeometry.c"],
+    **quiet)
 
-setup (name = "cGeometry",
-       version = "0.1",
-       author = "Tom De Smedt",
-       description = "Fast geometric functionality.",
-       ext_modules = [cGeometry])
\ No newline at end of file
+setup(name="cGeometry",
+    version="0.1",
+    author="Tom De Smedt",
+    description="Fast geometric functionality.",
+    ext_modules=[cGeometry])
\ No newline at end of file
diff --git a/app/deps/pathmatics/setup.py b/app/deps/pathmatics/setup.py
index 3f2f1ea0..45cc1e90 100644
--- a/app/deps/pathmatics/setup.py
+++ b/app/deps/pathmatics/setup.py
@@ -2,12 +2,17 @@
 from setuptools.extension import Extension
 
 cPathmatics = Extension("cPathmatics",
-                        sources = ["pathmatics.m", "gpc.c",],
-                        extra_link_args=['-framework', 'AppKit', '-framework', 'Foundation'],
-                        extra_compile_args=['-Qunused-arguments'])
+    sources=[
+        "pathmatics.m",
+        "gpc.c"],
+    extra_link_args=[
+        '-framework', 'AppKit',
+        '-framework', 'Foundation'],
+    extra_compile_args=[
+        '-Qunused-arguments'])
 
-setup (name = "pathmatics",
-       version = "1.0",
-       author = "Written for NodeBox by Tom De Smedt and Frederik De Bleser",
-       description = "Fast bezier math routines.",
-       ext_modules = [cPathmatics])
\ No newline at end of file
+setup(name="pathmatics",
+    version="1.0",
+    author="Written for NodeBox by Tom De Smedt and Frederik De Bleser",
+    description="Fast bezier math routines.",
+    ext_modules=[cPathmatics])
\ No newline at end of file
diff --git a/app/macros.h b/app/macros.h
new file mode 100644
index 00000000..3258feb3
--- /dev/null
+++ b/app/macros.h
@@ -0,0 +1,10 @@
+
+/// NSString to (char *)
+#ifndef CSTRING
+    #define CSTRING(NSStringRef) (char *)[NSStringRef UTF8String]
+#endif
+
+/// NSString to (PyString *)
+#ifndef PYSTRING
+    #define PYSTRING(NSStringRef) PyString_FromString((char *)[NSStringRef UTF8String])
+#endif
diff --git a/app/main.m b/app/main.m
index ead820e7..8bad951e 100644
--- a/app/main.m
+++ b/app/main.m
@@ -1,13 +1,28 @@
 #import <Python.h>
+#include "macros.h"
+
+#ifndef PLOTDEVICE_PYTHON
+    #define PLOTDEVICE_PYTHON "/usr/bin/python"
+#endif
 
 int main(int argc, char *argv[])
 {
     @autoreleasepool{
-        Py_SetProgramName("/usr/bin/python");
+        Py_SetProgramName(PLOTDEVICE_PYTHON);
         Py_Initialize();
         PySys_SetArgv(argc, (char **)argv);
+        
+        NSString *mainBundlePath = [[NSBundle mainBundle] bundlePath];
+        NSString *bundleSitePackages = [mainBundlePath stringByAppendingPathComponent:@"Contents/Resources/python"];
+        NSString *bundlePyObjC = [bundleSitePackages stringByAppendingPathComponent:@"PyObjC"];
+        
+        PyObject *sys = PyImport_ImportModule("sys");
+        PyObject *path = PyObject_GetAttrString(sys, "path");
+        PyList_Insert(path, (Py_ssize_t)0, PYSTRING(bundleSitePackages));
+        PyList_Insert(path, (Py_ssize_t)0, PYSTRING(bundlePyObjC));
+        
         NSString *mainFilePath = [[NSBundle mainBundle] pathForResource:@"plotdevice-app" ofType:@"py"];
         NSString *mainFileName = [mainFilePath lastPathComponent];
-        return PyRun_SimpleFile(fopen([mainFilePath UTF8String], "r"), (char *)[mainFileName UTF8String]);
+        return PyRun_SimpleFile(fopen([mainFilePath UTF8String], "r"), CSTRING(mainFileName));
     }
 }
diff --git a/app/plotdevice b/app/plotdevice
index b452a4be..52210b04 100755
--- a/app/plotdevice
+++ b/app/plotdevice
@@ -58,6 +58,7 @@ import argparse
 import json
 import signal
 from subprocess import Popen, PIPE
+#from distutils.spawn import find_executable as which
 from os.path import exists, islink, dirname, abspath, realpath, join
 
 def parse_args():
@@ -162,6 +163,7 @@ def main():
   opts = parse_args()
   root = module_root()
   env = dict(os.environ)
+  PYTHON = "/usr/bin/python" # run the backend with the system python
 
   # install a signal handler to catch ^c
   def cancel(*args):
@@ -170,11 +172,11 @@ def main():
   signal.signal(signal.SIGINT, cancel)
 
   # launch the back-end of the console-runner and pipe in our params
-  py_path = filter(None, env.get('PYTHONPATH','').split(':')) # BUG: should it be unfiltered?
-  py_path.append(root)
+  py_path = filter(exists, env.get('PYTHONPATH', '').split(':'))
+  py_path.insert(0, root)
   env['PYTHONPATH'] = ":".join(py_path)
   script = join(root, 'plotdevice/run/console.py')
-  p = Popen(['/usr/bin/python', script], env=env, stdin=PIPE)
+  p = Popen([PYTHON, script], env=env, stdin=PIPE)
   p.stdin.write(json.dumps(vars(opts))+"\n")
   p.wait()
 
diff --git a/app/plotdevice-app.py b/app/plotdevice-app.py
index 2a7bf874..013bcfb4 100644
--- a/app/plotdevice-app.py
+++ b/app/plotdevice-app.py
@@ -1,16 +1,36 @@
+
 import sys
-import objc
-import Foundation
-import AppKit
-from signal import signal, SIGINT
-from os.path import dirname, abspath, join
-from PyObjCTools import AppHelper
+from os import environ as env
+from os.path import isdir, join
+
+# if there's a python in /usr/local, it's probably homebrew -- let's use it!
+#local_packages = '/usr/local/lib/python2.7/site-packages'
+#if isdir(local_packages):
+#    sys.path.append(local_packages)
 
-# rather than hijacking PYTHONPATH in the .m loader, add the module directory now
-sys.path.append('%s/Contents/Resources/python'%abspath(Foundation.NSBundle.mainBundle().bundlePath()))
+# If running from a py2app build, update sys.path
+# with the bundle-local python package directory
+RESOURCEPATH = env.get('RESOURCEPATH')
+if RESOURCEPATH:
+    sys.path.insert(0,
+        join(RESOURCEPATH, 'python'))
+    sys.path.insert(0,
+        join(RESOURCEPATH, 'python', 'PyObjC'))
+
+# remove dupes from sys.path -- for an explanation see:
+# http://stackoverflow.com/a/480227/298171
+seen = set()
+seen_add = seen.add
+clean_path = tuple(directory for directory in sys.path \
+    if directory not in seen and \
+        not seen_add(directory))
+sys.path = list(clean_path)
 
 # install a signal handler to quit on ^c (should the app ever be launched from terminal)
-signal(SIGINT, lambda m,n: AppKit.NSApplication.sharedApplication().terminate_(True))
+import objc
+import AppKit
+from signal import signal, SIGINT
+signal(SIGINT, lambda m, n: AppKit.NSApplication.sharedApplication().terminate_(True))
 
 # PlotDevice is a typical document-based application. We'll import the PlotDeviceDocument
 # class et al from the gui module and the corresponding document-type defined in the
@@ -18,4 +38,5 @@
 import plotdevice.gui
 
 # loop forever
+from PyObjCTools import AppHelper
 AppHelper.runEventLoop()
diff --git a/app/plotdevice-term.py b/app/plotdevice-term.py
new file mode 100755
index 00000000..d71f1809
--- /dev/null
+++ b/app/plotdevice-term.py
@@ -0,0 +1,13 @@
+#!/usr/bin/python
+# encoding: utf-8
+
+print "Loading PlotDevice.app environment..."
+
+import plotdevice # adds pyobjc to sys.path as a side effect...
+import objc # ...otherwise this would fail
+from Foundation import *
+from AppKit import *
+from PyObjCTools import AppHelper
+from plotdevice.gui import ScriptController
+from plotdevice.util import rsrc_path
+from plotdevice.run import encoding
diff --git a/etc/download.sh b/etc/download.sh
new file mode 100644
index 00000000..9c188521
--- /dev/null
+++ b/etc/download.sh
@@ -0,0 +1,62 @@
+#!/usr/bin/env bash
+# download_to, expand_tarball_to, expand_zipwad_to, download_and_expand
+
+download_to () {
+    in_url="${1:?URL expected}"
+    out_file="${2:?pathname expected}"
+    success=0
+    [[ -r $out_file ]] && echo "- Already exists: ${out_file}" && return 1
+    echo "+ Retrieving remote file: ${in_url}"
+    test ! -r $out_file && test -x `which wget` && wget --tries=40 --retry-connrefused $in_url -O $out_file && success=1
+    test ! -r $out_file && test -x `which curl` && curl -L $in_url -o $out_file && success=1
+    test ! -r $out_file && test -x `which http` && http -d $in_url -o $out_file && success=1
+    [ $success == 0 ] && test -r $out_file && rm $out_file
+    [ $success == 0 ] && echo "- Couldn't download. Tried: wget, curl, httpie" && return 1
+    echo "+ Downloaded to: ${out_file}"
+}
+
+expand_tarball_to () {
+    in_tarball="${1:?tarball expected}"
+    out_directory="${2:?pathname expected}"
+    [[ ! -r $in_tarball ]] && echo "- Can't read tarball: ${in_tarball}" && return 1
+    [[ -d $out_directory ]] && rm -rf $out_directory
+    mkdir -p $out_directory
+    echo "+ Expanding tarball: $(basename ${in_tarball})"
+    echo "+ Expansion destination: ${out_directory}"
+    tar xzf $in_tarball --strip-components=1 --directory=$out_directory
+}
+
+expand_zipwad_to () {
+    in_zipwad="${1:?zipwad expected}"
+    out_directory="${2:?pathname expected}"
+    tmp_directory="$(mktemp -d -t XXXXX)"
+    [[ ! -r $in_zipwad ]] && echo "- Can't read zipwad: ${in_zipwad}" && return 1
+    [[ -d $out_directory ]] && rm -rf $out_directory
+    echo "+ Unzipping zipwad: $(basename ${in_zipwad})"
+    echo "+ Unzip destination: ${out_directory}"
+    unzip -q -d $tmp_directory $in_zipwad
+    expanded_directory=("$tmp_directory"/*)
+    if (( ${#tmp_directory[@]} == 1 )) && [[ -d $tmp_directory ]]; then
+        mv "${tmp_directory}"/* $out_directory && rm -rf $tmp_directory
+    else
+        echo "Unzip failed, deleting temporary files: ${tmp_directory}"
+        [[ -d $tmp_directory ]] && rm -rf $tmp_directory
+        return 1
+    fi
+}
+
+download_and_expand () {
+    url="${1:?URL expected}"
+    url_basename="$(basename ${url})"
+    url_suffix="${url_basename#*.}"
+    destination_directory="${2:-${url_basename%%.*}}"
+    tmp_directory="$(mktemp -d -t XXXXX)"
+    tmp_archive="${tmp_directory}/${url_basename}"
+    download_to $url $tmp_archive || return 1
+    [[ ${url_suffix,,} == *zip ]] \
+        && expand_zipwad_to $tmp_archive $destination_directory
+    [[ ${url_suffix,,} != *zip ]] \
+        && expand_tarball_to $tmp_archive $destination_directory
+    rm $tmp_archive
+    [[ -d $tmp_directory ]] && rm -rf $tmp_directory
+}
\ No newline at end of file
diff --git a/etc/load-cache.sh b/etc/load-cache.sh
new file mode 100755
index 00000000..4144371b
--- /dev/null
+++ b/etc/load-cache.sh
@@ -0,0 +1,104 @@
+#!/usr/bin/env bash
+
+SCRIPT_DIR="$(cd `dirname "${BASH_SOURCE[0]}"` && pwd)" # http://stackoverflow.com/a/246128/298171
+PLOTDEVICE=`dirname $SCRIPT_DIR`
+cd $PLOTDEVICE
+
+PRAXA_DOWNLOAD_CACHE="${PLOTDEVICE}/cache/downloads"
+WHEELHOUSE="${PLOTDEVICE}/cache/wheelhouse"
+mkdir -p $PRAXA_DOWNLOAD_CACHE
+mkdir -p $WHEELHOUSE
+mkdir -p build
+
+source "etc/download.sh"
+source "etc/urlcache.sh"
+
+PYOBJC_VERSION="2.5.1"
+PYOBJC_DOWNLOAD_URL="https://bitbucket.org/ronaldoussoren/pyobjc/get/pyobjc-${PYOBJC_VERSION}.zip"
+PYOBJC_BUILD_PATH="build/pyobjc-${PYOBJC_VERSION}"
+PYOBJC_VIRTUALENV="build/pyobjc-virtualenv-${PYOBJC_VERSION}"
+
+rm -rf $PYOBJC_BUILD_PATH $PYOBJC_VIRTUALENV
+fetch_and_expand $PYOBJC_DOWNLOAD_URL $PYOBJC_BUILD_PATH
+
+declare -a names=( \
+"AppleScriptKit" \
+"Accounts" \
+"AddressBook" \
+"AppleScriptKit" \
+"AppleScriptObjC" \
+"Automator" \
+"CFNetwork" \
+"CalendarStore" \
+"Cocoa" \
+"Collaboration" \
+"CoreData" \
+"CoreLocation" \
+"CoreText" \
+"DictionaryServices" \
+"EventKit" \
+"ExceptionHandling" \
+"FSEvents" \
+"InputMethodKit" \
+"InstallerPlugins" \
+"InstantMessage" \
+"InterfaceBuilderKit" \
+"LatentSemanticMapping" \
+"LaunchServices" \
+"OpenDirectory" \
+"PreferencePanes" \
+"PubSub" \
+"QTKit" \
+"Quartz" \
+"ScreenSaver" \
+"ScriptingBridge" \
+"SearchKit" \
+"ServerNotification" \
+"ServiceManagement" \
+"Social" \
+"SyncServices" \
+"SystemConfiguration" \
+"WebKit" \
+)
+
+PYOBJC_DIR=${PLOTDEVICE}/$PYOBJC_BUILD_PATH
+FIND="for fn in install_lib._install_lib.get_outputs(self):"
+REPLACE="for fn, _ in result.items():"
+
+########## FIX SETUPS ######################################################################
+
+cd $PYOBJC_DIR/pyobjc-core && sed -i \~ -e "s#${FIND}#${REPLACE}#" distribute_setup.py
+cd $PYOBJC_DIR/pyobjc-core && sed -i \~ -e "s#${FIND}#${REPLACE}#" setup.py
+cd $PYOBJC_DIR/pyobjc && sed -i \~ -e "s#${FIND}#${REPLACE}#" distribute_setup.py
+cd $PYOBJC_DIR/pyobjc && sed -i \~ -e "s#${FIND}#${REPLACE}#" setup.py
+
+for name in "${names[@]}"; do
+    cd $PYOBJC_DIR && \
+    cd "pyobjc-framework-${name}" && \
+    sed -i \~ -e "s#${FIND}#${REPLACE}#" *setup.py
+done
+
+find $PYOBJC_DIR -name \*.py~ -print -delete
+
+########## VIRTUALENV INSTALLATION (NECESSARY FOR EXTENSION BUILDING) ######################
+
+virtualenv -p `which python` $PYOBJC_VIRTUALENV
+source $PYOBJC_VIRTUALENV/bin/activate
+cd $PYOBJC_DIR/pyobjc-core && pip install --no-deps .
+
+########## WHEELHOUSE: PYOBJC ##############################################################
+
+cd $PYOBJC_DIR/pyobjc-core && pip wheel --no-deps -w $WHEELHOUSE .
+cd $PYOBJC_DIR/pyobjc && pip wheel --no-deps -w $WHEELHOUSE .
+
+for name in "${names[@]}"; do
+    cd $PYOBJC_DIR && \
+    cd "pyobjc-framework-${name}" && \
+    pip wheel --no-deps -w $WHEELHOUSE .
+done
+
+########## WHEELHOUSE: OTHER ###############################################################
+
+cd $PLOTDEVICE
+pip wheel -w $WHEELHOUSE -r "${SCRIPT_DIR}/required-wheels.txt"
+
diff --git a/etc/relpath.sh b/etc/relpath.sh
new file mode 100644
index 00000000..862fadf7
--- /dev/null
+++ b/etc/relpath.sh
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+#  relpath.sh
+#  PlotDevice
+#
+#  Created by FI$H 2000 on 7/9/14.
+#
+#  See also:
+#  http://stackoverflow.com/a/14914070/298171
+#
+#
+
+relpath () {
+    [ $# -ge 1 ] && [ $# -le 2 ] || return 1
+    current="${2:+"$1"}"
+    target="${2:-"$1"}"
+    [ "$target" != . ] || target=/
+    target="/${target##/}"
+    [ "$current" != . ] || current=/
+    current="${current:="/"}"
+    current="/${current##/}"
+    appendix="${target##/}"
+    relative=''
+    while appendix="${target#"$current"/}"
+        [ "$current" != '/' ] && [ "$appendix" = "$target" ]; do
+        if [ "$current" = "$appendix" ]; then
+            relative="${relative:-.}"
+            echo "${relative#/}"
+            return 0
+        fi
+        current="${current%/*}"
+        relative="$relative${relative:+/}.."
+    done
+    relative="$relative${relative:+${appendix:+/}}${appendix#/}"
+    echo "$relative"
+}
diff --git a/etc/required-wheels.txt b/etc/required-wheels.txt
new file mode 100644
index 00000000..0baf8278
--- /dev/null
+++ b/etc/required-wheels.txt
@@ -0,0 +1,2 @@
+#Pillow>=2.1.0
+bpython==0.13.1
\ No newline at end of file
diff --git a/etc/urlcache.sh b/etc/urlcache.sh
new file mode 100755
index 00000000..6dd99afc
--- /dev/null
+++ b/etc/urlcache.sh
@@ -0,0 +1,75 @@
+#!/usr/bin/env bash
+# __url_hash_filename, __url_cache_filename
+# __cache_has_url, __cache_clear_url, __cache_purge
+# cache_url, fetch_from_cache_to, fetch_and_expand
+
+__url_hash_filename () {
+    url="${1:?URL expected}"
+    url_basename="$(basename ${url})"
+    url_suffix="${2:-${url_basename##*.}}"
+    url_hash=$(echo $url | openssl dgst -sha1 | awk '{ split($0, a, /\=\s/); print a[1]; }')
+    echo "${url_hash}.${url_suffix,,}"
+}
+
+__url_cache_filename () {
+    url="${1:?URL expected}"
+    cache_location="${2:-${PRAXA_DOWNLOAD_CACHE}}"
+    url_hash_filename="$(__url_hash_filename ${url})"
+    cache_file="${cache_location}/${url_hash_filename}"
+    echo $cache_file
+}
+
+__cache_has_url () {
+    url="${1:?URL expected}"
+    cache_location="${2:-${PRAXA_DOWNLOAD_CACHE}}"
+    test -r $(__url_cache_filename ${url} ${cache_location})
+}
+
+__cache_clear_url () {
+    url="${1:?URL expected}"
+    cache_location="${2:-${PRAXA_DOWNLOAD_CACHE}}"
+    rm $(__url_cache_filename $url $cache_location)
+}
+
+__cache_purge () {
+    cache_location="${1:-${PRAXA_DOWNLOAD_CACHE}}"
+    rm ${cache_location}/*
+}
+
+cache_url () {
+    url="${1:?URL expected}"
+    cache_file="$(__url_cache_filename ${url})"
+    __cache_has_url $url || download_to $url $cache_file 1>&2
+    if [[ ! -r $cache_file ]]; then
+        echo "ERROR: no cached file: ${cache_file}" 1>&2
+        echo ""
+        return 1
+    fi
+    echo $cache_file
+}
+
+fetch_from_cache_to () {
+    in_url="${1:?URL expected}"
+    out_file="${2:?pathname expected}"
+    [[ -r $out_file ]] && echo "- Already exists: ${out_file}" && return 1
+    out_cached_file="$(cache_url $in_url)"
+    echo "+ Fetching from cache: ${out_cached_file}"
+    cp $out_cached_file $out_file
+    [[ -r $out_file ]] && echo "+ Fetched from cache: ${out_file}"
+}
+
+fetch_and_expand () {
+    url="${1:?URL expected}"
+    url_basename="$(basename ${url})"
+    url_suffix="${url_basename#*.}"
+    destination_directory="${2:-${url_basename%%.*}}"
+    tmp_directory="$(mktemp -d -t XXXXX)"
+    tmp_archive="${tmp_directory}/${url_basename}"
+    fetch_from_cache_to $url $tmp_archive || return 1
+    [[ ${url_suffix,,} == *zip ]] \
+        && expand_zipwad_to $tmp_archive $destination_directory
+    [[ ${url_suffix,,} != *zip ]] \
+        && expand_tarball_to $tmp_archive $destination_directory
+    rm $tmp_archive
+    [[ -d $tmp_directory ]] && rm -rf $tmp_directory
+}
\ No newline at end of file
diff --git a/plotdevice/__init__.py b/plotdevice/__init__.py
index dbae83e5..2651c742 100644
--- a/plotdevice/__init__.py
+++ b/plotdevice/__init__.py
@@ -19,27 +19,21 @@
 MIT Licensed (see README file for details)
 """
 
-__version__ = '0.9.2'
-__author__  = 'Christian Swinehart'
-__email__   = "drafting@samizdat.cc"
-__credits__ = 'Frederik De Bleser, Tom De Smedt, Just van Rossum, & Marcos Ojeda'
-__license__ = 'MIT'
-
-
-# add the shared directory (for Libraries) to the path
-import sys, re, os
-sys.path.append(os.path.join(os.getenv('HOME'), 'Library', 'Application Support', 'PlotDevice'))
-
-# add the Extras directory to sys.path since every module depends on PyObjC and friends
-try:
-    import objc
-except ImportError:
-    extras = '/System/Library/Frameworks/Python.framework/Versions/2.7/Extras/lib/python'
-    sys.path.extend([extras, '%s/PyObjC'%extras])
-    import objc
-
-# print python exceptions to the console rather than silently failing
-objc.setVerbose(True)
+# Add the shared directory (for Libraries) to the path
+import sys, re
+from os import getenv, environ as env
+from os.path import join
+sys.path.append(
+    join(getenv('HOME'), 'Library', 'Application Support', 'PlotDevice'))
+
+# If running from a py2app build, update sys.path
+# with the bundle-local python package directory
+RESOURCEPATH = env.get('RESOURCEPATH')
+if RESOURCEPATH:
+    sys.path.insert(0,
+        join(RESOURCEPATH, 'python'))
+    sys.path.insert(0,
+        join(RESOURCEPATH, 'python', 'PyObjC'))
 
 # the global non-conflicting token (fingers crossed)
 INTERNAL = '_p_l_o_t_d_e_v_i_c_e_'
@@ -63,6 +57,23 @@ class Halted(Exception):
     # global namespace. we'll let the Sandbox handle populating the namespace instead.
     __all__ = []
 else:
+    # add the Extras directory to sys.path since every module depends on PyObjC and friends
+    try:
+        import objc
+    except ImportError:
+        from pprint import pformat
+        with open("/tmp/plotdevice-panic.log", "w+b") as log:
+            log.write("ENV:\n")
+            log.writelines(pformat(dict(env)).split('\n'))
+            log.flush()
+        #extras = '/System/Library/Frameworks/Python.framework/Versions/2.7/Extras/lib/python'
+        extras = sys.prefix
+        sys.path.extend([extras, '%s/PyObjC'%extras])
+        import objc
+
+    # print python exceptions to the console rather than silently failing
+    objc.setVerbose(True)
+
     # if imported from an external module, set up a drawing environment in __all__.
     # (note that since this happens at the module level, the canvas will be shared
     # among all the files in a given process that `import *`).
diff --git a/plotdevice/context.py b/plotdevice/context.py
index af435dab..329e4500 100644
--- a/plotdevice/context.py
+++ b/plotdevice/context.py
@@ -1088,10 +1088,20 @@ def image(self, *args, **kwargs):
         """
         draw = kwargs.pop('draw', self._autoplot)
         draw = kwargs.pop('plot', draw)
+        
+        imageFilter = kwargs.pop('filter', None)
+        #imageFilterName = hasattr(imageFilter, 'className') and str(imageFilter.className()) or ''
 
         img = Image(*args, **kwargs)
+
+        if imageFilter and imageFilterName:
+            pass
+            #print "Applying image filter: %s" % imageFilterName
+            #img.applyFilter(imageFilter)
+
         if draw:
             img.draw()
+
         return img
 
     def imagesize(self, path, data=None):
diff --git a/plotdevice/gfx/__init__.py b/plotdevice/gfx/__init__.py
index b911dfa0..4ca6d62b 100644
--- a/plotdevice/gfx/__init__.py
+++ b/plotdevice/gfx/__init__.py
@@ -36,6 +36,14 @@ def _cg_layer():
 def _cg_port():
     return NSGraphicsContext.currentContext().graphicsPort()
 
+@contextmanager
+def _ci_context():
+    ctx = NSGraphicsContext.currentContext()
+    ctx.saveGraphicsState()
+    #yield CIContext.contextWithCGContext_options_(_cg_port(), None)
+    yield ctx.CIContext()
+    ctx.restoreGraphicsState()
+
 ### submodule init ###
 
 # pool the submodules' __all__ namespaces into our own
diff --git a/plotdevice/gfx/atoms.py b/plotdevice/gfx/atoms.py
index 557381ba..dbc1d6c4 100644
--- a/plotdevice/gfx/atoms.py
+++ b/plotdevice/gfx/atoms.py
@@ -213,6 +213,22 @@ def _set_stroke(self, *args):
         self._strokecolor = None if args[0] is None else Color(*args)
     stroke = property(_get_stroke, _set_stroke)
 
+# class ManagedColorMixin(Grob):
+#     ctxAttrs = ('_renderprofile', '_proofprofile')
+#     stateAttrs = ('_inputprofile',)
+#     opts = ('render', 'input', 'proof',)
+#     
+#     def __init__(self, **kwargs):
+#         super(ManagedColorMixin, self).__init__(**kwargs)
+#         for attr in ManagedColorMixin.opts:
+#             if attr in kwargs:
+#                 setattr(self, attr, kwargs[attr])
+#     
+#     def _get_renderprofile(self):
+#         return self._renderprofile
+#     def _set_renderprofile(self, profile=None):
+#         self._renderprofile = 'CGDisplayCopyColorSpace'
+
 class TransformMixin(Grob):
     """Mixin class for transformation support.
     Adds the _transform and _transformmode attributes to the class."""
diff --git a/plotdevice/gui/__init__.py b/plotdevice/gui/__init__.py
index 31d1646f..373893d5 100644
--- a/plotdevice/gui/__init__.py
+++ b/plotdevice/gui/__init__.py
@@ -1,8 +1,10 @@
-def bundle_path(subpath=None, rsrc=None, fmwk=None):
+def bundle_path(subpath=None, rsrc=None, fmwk=None, shared=None):
     """Find the path to the main NSBundle (or an optional subpath within it)"""
     from os.path import join
     from Foundation import NSBundle
     bundle = NSBundle.mainBundle().bundlePath()
+    if shared:
+      return join(bundle, "Contents", "SharedSupport", shared)
     if rsrc:
       return join(bundle, "Contents", "Resources", rsrc)
     if fmwk:
diff --git a/plotdevice/gui/app.py b/plotdevice/gui/app.py
index fe3424b8..09e1f73e 100644
--- a/plotdevice/gui/app.py
+++ b/plotdevice/gui/app.py
@@ -1,10 +1,12 @@
 # encoding: utf-8
 import sys
-import os
 import objc
+from os import mkdir, getenv
+from os.path import join, exists, basename, dirname
 from glob import glob
 from Foundation import *
 from AppKit import *
+from ScriptingBridge import SBApplication
 from PyObjCTools import AppHelper
 from .preferences import PlotDevicePreferencesController, get_default
 from . import bundle_path, set_timeout
@@ -19,18 +21,18 @@ class PlotDeviceAppDelegate(NSObject):
     def awakeFromNib(self):
         self._prefsController = None
         self._docsController = NSDocumentController.sharedDocumentController()
-        libDir = os.path.join(os.getenv("HOME"), "Library", "Application Support", "PlotDevice")
+        libDir = join(getenv("HOME"), "Library", "Application Support", "PlotDevice")
         try:
-            if not os.path.exists(libDir):
-                os.mkdir(libDir)
-                f = open(os.path.join(libDir, "README.txt"), "w")
+            if not exists(libDir):
+                mkdir(libDir)
+                f = open(join(libDir, "README.txt"), "w")
                 f.write(LIB_DIR_README)
                 f.close()
         except OSError: pass
         except IOError: pass
 
     def applicationDidFinishLaunching_(self, note):
-        mm=NSApp().mainMenu()
+        mm = NSApp().mainMenu()
 
         # disable the start-dictation item in the edit menu
         edmenu = mm.itemAtIndex_(2).submenu()
@@ -49,7 +51,7 @@ def applicationDidFinishLaunching_(self, note):
         # If the sparkle framework was installed in our bundle, init an updater
         self.sparkle = None
         sparkle_path = bundle_path(fmwk='Sparkle')
-        if os.path.exists(sparkle_path):
+        if exists(sparkle_path):
             objc.loadBundle('Sparkle', globals(), bundle_path=sparkle_path)
             self.sparkle = objc.lookUpClass('SUUpdater').sharedUpdater()
             self.updatesMenu.setTarget_(self.sparkle)
@@ -63,15 +65,15 @@ def applicationWillBecomeActive_(self, note):
 
     def updateExamples(self):
         examples_folder = bundle_path(rsrc="examples")
-        pyfiles = glob('%s/*/*.pv'%examples_folder)
+        pyfiles = glob('%s/*/*.pv' % examples_folder)
         categories = self.examplesMenu.submenu()
         folders = {}
         for item in categories.itemArray():
             item.submenu().removeAllItems()
             folders[item.title()] = item.submenu()
         for fn in sorted(pyfiles):
-            cat = os.path.basename(os.path.dirname(fn))
-            example = os.path.basename(fn)
+            cat = basename(dirname(fn))
+            example = basename(fn)
             item = NSMenuItem.alloc().initWithTitle_action_keyEquivalent_(example[:-3], "openExample:", "")
             item.setRepresentedObject_(fn)
             folders[cat].addItem_(item)
@@ -114,6 +116,19 @@ def showSite_(self, sender):
         url = NSURL.URLWithString_("http://plotdevice.io/")
         NSWorkspace.sharedWorkspace().openURL_(url)
 
+    @objc.IBAction
+    def openTerminal_(self, sender):
+        """ Open a Terminal.app window running bpython,
+            with the PlotDevice.app environment pre-loaded """
+        TerminalApp = SBApplication.applicationWithBundleIdentifier_("com.apple.Terminal")
+        scriptPythonPath = ":".join(sys.path)
+        scriptBPythonExecutable = bundle_path(shared='bplotdevice')
+        scriptBPythonSetup = bundle_path(rsrc='plotdevice-term.py')
+        scriptCommand = '''cd %s && PYTHONPATH="%s" %s -i %s && exit''' % (
+            bundle_path(), scriptPythonPath, scriptBPythonExecutable, scriptBPythonSetup)
+        TerminalApp.activate()
+        TerminalApp.doScript_in_(scriptCommand, None)
+
     def applicationWillTerminate_(self, note):
         import atexit
         atexit._run_exitfuncs()
diff --git a/plotdevice/lib/__init__.py b/plotdevice/lib/__init__.py
index 17721df9..5c15e3f1 100644
--- a/plotdevice/lib/__init__.py
+++ b/plotdevice/lib/__init__.py
@@ -1,5 +1,6 @@
 import sys
 from os.path import join, abspath, dirname, exists
+from pprint import pformat
 
 # do some special-case handling when the module is imported from within the source dist
 # (determined by checking the existence project files at a known path). if we're in the
@@ -9,16 +10,32 @@
     so_dir = join(module_root, 'build/lib/plotdevice/lib')
     sys.path.append(so_dir)
     if not exists(so_dir):
-        unbuilt = 'Build the plotdevice module with `python setup.pt build\' before attempting import it.'
+        unbuilt = 'Build the plotdevice module with `python setup.py build\' before attempting import it.'
         raise RuntimeError(unbuilt)
 
 # test the sys.path by attempting to load the c-extensions
+# io, geometry, pathmatics, -- (cIO.so, cGeometry.so & cPathmatics.so)
+notfound_tmpl = "Couldn't load extension: %s.so\nSearched in:\n%s\nto no avail..."
+notfound = lambda lib_name: notfound_tmpl % (
+    lib_name, pformat(sys.path))
+
+try:
+    import io
+except ImportError:
+    raise RuntimeError(notfound('cIO'))
+
 try:
-    import geometry, io, pathmatics
+    import geometry
 except ImportError:
-    from pprint import pformat
-    notfound = "Couldn't locate C extensions (cIO.so, cGeometry.so, & cPathmatics.so).\nSearched in:\n%s\nto no avail..."%pformat(sys.path)
-    raise RuntimeError(notfound)
+    raise RuntimeError(notfound('cGeometry'))
+
+try:
+    import pathmatics
+except ImportError:
+    raise RuntimeError(notfound('cPathmatics'))
+
+# FUCKING FLAKE-EIGHT ENOUGH ALREADY FOR FUCK'S SAKE
+io = geometry = pathmatics = None
 
 # allow Libraries to request a _ctx reference
 def register(module):
diff --git a/plotdevice/run/console.py b/plotdevice/run/console.py
index 041b3c4d..f1b0ba11 100755
--- a/plotdevice/run/console.py
+++ b/plotdevice/run/console.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # encoding: utf-8
 """
 console.py
diff --git a/plotdevice/util/__init__.py b/plotdevice/util/__init__.py
index b6c3c78b..1b52908f 100644
--- a/plotdevice/util/__init__.py
+++ b/plotdevice/util/__init__.py
@@ -9,7 +9,12 @@
 from random import choice, shuffle
 from plotdevice import DeviceError
 
-__all__ = ('grid', 'random', 'shuffled', 'choice', 'ordered', 'order', 'files', 'read', 'autotext', '_copy_attr', '_copy_attrs', 'odict', 'ddict', 'adict')
+__all__ = (
+    'grid', 'random', 'shuffled',
+    'choice', 'ordered', 'order',
+    'files', 'read', 'autotext',
+    '_copy_attr', '_copy_attrs',
+    'odict', 'ddict', 'adict')
 
 ### Utilities ###
 
@@ -186,7 +191,7 @@ def __repr__(self, indent=2):
         result += '}'
         return result
 
-class odict(BetterRepr,OrderedDict):
+class odict(BetterRepr, OrderedDict):
     """Dictionary that remembers insertion order
 
     Normal dict objects return keys in an arbitrary order. An odict will return them in
@@ -202,7 +207,7 @@ class odict(BetterRepr,OrderedDict):
     """
     pass
 
-class ddict(BetterRepr,defaultdict):
+class ddict(BetterRepr, defaultdict):
     """Dictionary with default factory
 
     Any time you access a key that was previously undefined, the factory function
@@ -244,7 +249,10 @@ def __setattr__(self, key, value):
         # this test allows attributes to be set in the __init__ method
         if not self.__dict__.has_key('_adict__initialised'):
             return dict.__setattr__(self, key, value)
-        self[key] = value
+        if key == "_keys":
+            adict.__setattr__(self, key, value)
+        else:
+            self[key] = value
 
     def __delattr__(self, key):
         try:
@@ -252,6 +260,16 @@ def __delattr__(self, key):
         except KeyError, k:
             raise AttributeError, k
 
+class aodict(adict, odict):
+    """
+    aodict -- an OrderedDict subclass that works like adict.
+    
+    The 'O' in 'AODict' is for 'Ordered' -- see the stdlib OrderedDict for deets, or refer to
+    the reimplementation in ordereddict.py, if your python install is lacking.
+    
+    """
+    pass
+
 
 ### datafile unpackers ###
 
@@ -339,3 +357,18 @@ def rsrc_path(resource=None):
     if resource:
         return join(rsrc_root, resource)
     return rsrc_root
+
+### display color profile ###
+
+def get_display_profile_path():
+    if not hasattr(get_display_profile_path, 'profile_path'):
+        import objc
+        from ScriptingBridge import SBApplication
+        ImageEvents = SBApplication.applicationWithBundleIdentifier_('com.apple.ImageEvents')
+        #ImageEvents.activate()
+        displays = ImageEvents.displays()
+        if len(displays) < 1:
+            get_display_profile_path.profile_path = None
+        get_display_profile_path.profile_path = displays[0].displayProfile().location().properties()['POSIXPath']
+        ImageEvents.quitSaving_(objc.NO)
+    return get_display_profile_path.profile_path
diff --git a/setup.py b/setup.py
index 878ef779..e4b8a7ff 100644
--- a/setup.py
+++ b/setup.py
@@ -20,23 +20,31 @@
 # - cPathMatics, cGeo, cIO, cEvent, & polymagic (included in the "app/deps" folder)
 # - Sparkle.framework (auto-downloaded only for `dist` builds)
 
-import sys,os
+import sys, os, urllib2, plistlib
 from distutils.dir_util import remove_tree
+from distutils.spawn import find_executable as which
+from distutils.core import Command
+from setuptools.command.sdist import sdist
+from distutils.command.build_py import build_py
 from setuptools import setup, find_packages
 from pkg_resources import DistributionNotFound
-from os.path import join, exists, dirname, basename, abspath
-import plotdevice
-
+from os import listdir, getcwd
+from os.path import join, exists, isdir, dirname, basename, abspath, getsize
 
 ## Metadata ##
+__version__ = '0.9.2'
+__author__  = 'Christian Swinehart'
+__email__   = "drafting@samizdat.cc"
+__credits__ = 'Frederik De Bleser, Tom De Smedt, Just van Rossum, & Marcos Ojeda'
+__license__ = 'MIT'
 
 # PyPI fields
 APP_NAME = 'PlotDevice'
 MODULE = APP_NAME.lower()
-VERSION = plotdevice.__version__
-AUTHOR = plotdevice.__author__
-AUTHOR_EMAIL = plotdevice.__email__
-LICENSE = plotdevice.__license__
+VERSION = __version__
+AUTHOR = __author__
+AUTHOR_EMAIL = __email__
+LICENSE = __license__
 URL = "http://plotdevice.io/"
 CLASSIFIERS = (
     "Development Status :: 5 - Production/Stable",
@@ -85,10 +93,9 @@
 
 # the sparkle updater framework will be fetched as needed
 SPARKLE_VERSION = '1.7.0'
-SPARKLE_URL = 'https://github.com/pornel/Sparkle/releases/download/%(v)s/Sparkle-%(v)s.tar.bz2'% {'v':SPARKLE_VERSION}
+SPARKLE_URL = 'https://github.com/pornel/Sparkle/releases/download/%(v)s/Sparkle-%(v)s.tar.bz2'% { 'v': SPARKLE_VERSION }
 
 # helpers for dealing with plists & git (spiritual cousins if ever there were)
-import plistlib
 def info_plist(pth='app/PlotDevice-Info.plist'):
     info = plistlib.readPlist(pth)
     # overwrite the xcode placeholder vars
@@ -128,7 +135,6 @@ def gosub(cmd, on_err=True):
     if on_err:
         msg = '%s:\n' % on_err if isinstance(on_err, basestring) else ''
         assert ret==0, msg + (err or out)
-
     return out, err, ret
 
 ## Distribution Build Utils ##
@@ -139,9 +145,8 @@ def timestamp():
     now = utc.localize(datetime.utcnow()).astimezone(timezone('US/Eastern'))
     return now.strftime("%a, %d %b %Y %H:%M:%S %z")
 
-import urllib2
 def last_release():
-    from xml.etree.ElementTree import fromstring, tostring
+    from xml.etree.ElementTree import fromstring
     feed_xml = urllib2.urlopen('http://plotdevice.io/app.xml').read().decode('utf-8')
     for item in fromstring(feed_xml.encode('utf-8')).iter('revision'):
         return item.text
@@ -175,24 +180,114 @@ def merged_feed(new_release):
         spliced.append(line)
     return (u"\n".join(spliced)).encode('utf-8')
 
-
-
 ## Build Commands ##
 
-from distutils.core import Command
 class CleanCommand(Command):
     description = "wipe out the ./build ./dist and app/deps/.../build dirs"
     user_options = []
-    def initialize_options(self):
-        pass
-    def finalize_options(self):
-        pass
+    def initialize_options(self): pass
+    def finalize_options(self): pass
     def run(self):
+        os.system('find . -iname .ds_store -print -delete')
+        os.system('find . -name \*.pyc -print -delete')
         os.system('rm -rf ./build ./dist')
+        os.system('rm -rf ./Xcode/Build ./Xcode/Intermediates ./DerivedData')
         os.system('rm -rf ./app/deps/*/build')
         os.system('rm -rf plotdevice.egg-info MANIFEST.in PKG')
 
-from setuptools.command.sdist import sdist
+class WheelhouseCache(Command):
+    description = "Cache wheels and wheel source"
+    user_options = [
+        ('clean', 'C', 'Clean wheelhouse and download cache')]
+    
+    def initialize_options(self):
+        self.clean = False
+    
+    def finalize_options(self):
+        self.clean = bool(self.clean)
+    
+    def run(self):
+        CACHE = join(getcwd(), 'cache')
+        CACHE_SCRIPT = join(getcwd(), 'etc', 'load-cache.sh')
+        if self.clean:
+            remove_tree(CACHE)
+            return
+        self.spawn([CACHE_SCRIPT])
+
+class WheelhouseToApp(Command):
+    description = "Install PlotDevice.app requirements from the wheelhouse"
+    user_options = [
+        ('wheelhouse=', 'w', 'Wheelhouse directory [default: cache/wheelhouse/]'),
+        ('app=', 'a', 'App bundle directory [default: dist/PlotDevice.app/]')]
+    
+    def initialize_options(self):
+        self.wheelhouse = 'cache/wheelhouse/'
+        self.app = 'dist/PlotDevice.app'
+    
+    def finalize_options(self):
+        self.wheelhouse = abspath(self.wheelhouse)
+        self.app = abspath(self.app)
+    
+    def run(self):
+        ''' try to install wheels to app bundle '''
+        if self.install_wheels():
+            print "Done installing wheels"
+    
+    def install_wheels(self):
+        ''' Install everything from the wheelhouse '''
+        try:
+            from wheel.install import WheelFile
+        except ImportError:
+            print "ERROR: install the `wheel` Python package to enable bundle-local PyObjC"
+            return False
+        
+        WHEELHOUSE = self.wheelhouse
+        APP = self.app
+        DITTO = which('ditto')
+        
+        if not isdir(WHEELHOUSE):
+            print "ERROR: no wheelhouse directory at %s" % WHEELHOUSE
+            return False
+        
+        WHEELS = filter(
+            lambda wheel_file: wheel_file.lower().endswith('.whl'),
+            listdir(WHEELHOUSE))
+        PYOBJC_WHEELS = filter(
+            lambda wheel_file: wheel_file.lower().startswith('pyobjc'),
+            WHEELS)
+        OTHER_WHEELS = sorted(list(
+            set(WHEELS) - set(PYOBJC_WHEELS)))
+        
+        CONTENTS = join(APP, 'Contents')
+        RESOURCES = join(CONTENTS, 'Resources')
+        SITE_PACKAGES = join(RESOURCES, 'python')
+        HEADERS = join(CONTENTS, 'PrivateHeaders')
+        SCRIPTS = join(CONTENTS, 'SharedSupport')
+        OVERRIDES = dict(
+            purelib=SITE_PACKAGES, platlib=SITE_PACKAGES, data=SITE_PACKAGES,
+            headers=HEADERS, scripts=SCRIPTS)
+        
+        self.mkpath(HEADERS)
+        
+        for pyobjc_wheel_file in sorted(PYOBJC_WHEELS):
+            print "+ Installing PyObjC wheel: %s" % pyobjc_wheel_file
+            wheel = WheelFile(join(WHEELHOUSE, pyobjc_wheel_file))
+            wheel.install(overrides=OVERRIDES, force=True)
+        
+        for wheel_file in sorted(OTHER_WHEELS):
+            print "+ Installing wheel: %s" % wheel_file
+            wheel = WheelFile(join(WHEELHOUSE, wheel_file))
+            wheel.install(overrides=OVERRIDES, force=True)
+        
+        # misc. PyObjC patching (ideally should obvi be fixed in the upstream repository)
+        self.spawn([DITTO,
+            join(SITE_PACKAGES, 'PyObjCTools'),
+            join(SITE_PACKAGES, 'PyObjC', 'PyObjCTools')])
+        self.spawn(['touch',
+            join(SITE_PACKAGES, 'PyObjC', 'PyObjCTools', '__init__.py')])
+        
+        return True
+
 class BuildDistCommand(sdist):
     def finalize_options(self):
         with file('MANIFEST.in','w') as f:
@@ -209,36 +304,34 @@ def run(self):
         remove_tree('plotdevice.egg-info')
         os.unlink('MANIFEST.in')
 
-from distutils.command.build_py import build_py
 class BuildCommand(build_py):
     def run(self):
         # first let the real build_py routine do its thing
         build_py.run(self)
 
         # then compile the extensions into the just-built module
-        self.spawn(['/usr/bin/python', 'app/deps/build.py', abspath(self.build_lib)])
+        self.spawn([which('python'), 'app/deps/build.py', abspath(self.build_lib)])
 
         # include some ui resources for running a script from the command line
-        rsrc_dir = '%s/plotdevice/rsrc'%self.build_lib
+        rsrc_dir = '%s/plotdevice/rsrc' % self.build_lib
         self.mkpath(rsrc_dir)
-        self.copy_file("app/Resources/colors.json", '%s/colors.json'%rsrc_dir)
-        self.spawn(['/usr/bin/ibtool','--compile', '%s/viewer.nib'%rsrc_dir, "app/Resources/English.lproj/PlotDeviceScript.xib"])
-        self.copy_file("app/Resources/PlotDeviceFile.icns", '%s/viewer.icns'%rsrc_dir)
+        self.copy_file("app/Resources/colors.json", '%s/colors.json' % rsrc_dir)
+        self.spawn([which('ibtool'), '--compile',
+            '%s/viewer.nib' % rsrc_dir,
+            "app/Resources/English.lproj/PlotDeviceScript.xib"])
+        self.copy_file("app/Resources/PlotDeviceFile.icns", '%s/viewer.icns' % rsrc_dir)
 
 class BuildAppCommand(Command):
     description = "Build PlotDevice.app with xcode"
     user_options = []
-    def initialize_options(self):
-        pass
-    def finalize_options(self):
-        pass
+    def initialize_options(self): pass
+    def finalize_options(self): pass
     def run(self):
         self.spawn(['xcodebuild'])
         remove_tree('dist/PlotDevice.app.dSYM')
         print "done building PlotDevice.app in ./dist"
 
 try:
-    import py2app
     from py2app.build_app import py2app as build_py2app
     class BuildPy2AppCommand(build_py2app):
         description = """Build PlotDevice.app with py2app (then undo some of its questionable layout defaults)"""
@@ -247,8 +340,11 @@ def initialize_options(self):
         def finalize_options(self):
             self.verbose=0
             build_py2app.finalize_options(self)
+        
+        sub_commands = build_py2app.sub_commands[:]
+        sub_commands.append(('wheelhouse', lambda arg: True))
+        
         def run(self):
-            assert os.getcwd() == self.cwd, 'Must be in package root: %s' % self.cwd
             build_py2app.run(self)
             if self.dry_run:
                 return
@@ -259,22 +355,30 @@ def run(self):
 
             # set up internal paths and ensure destination dirs exist
             RSRC = self.resdir
-            BIN = join(dirname(RSRC), 'SharedSupport')
-            MODULE = join(self.bdist_base, 'lib/plotdevice')
+            CONTENTS = dirname(RSRC)
+            BIN = join(CONTENTS, 'SharedSupport')
+            MODULE = join(self.bdist_base, 'lib', 'plotdevice')
             PY = join(RSRC, 'python')
+            PLOTDEVICE = join(PY, 'plotdevice')
+            DITTO = which('ditto')
+
             for pth in BIN, PY:
                 self.mkpath(pth)
 
             # install the module in Resources/python
-            self.spawn(['/usr/bin/ditto', MODULE, join(PY, 'plotdevice')])
+            self.spawn([DITTO, MODULE, PLOTDEVICE])
 
             # discard the eggery-pokery
-            remove_tree(join(RSRC,'lib'), dry_run=self.dry_run)
-            os.unlink(join(RSRC,'include'))
-            os.unlink(join(RSRC,'site.pyc'))
+            remove_tree(join(RSRC, 'lib'), dry_run=self.dry_run)
+            os.unlink(join(RSRC, 'include'))
+            os.unlink(join(RSRC, 'site.pyc'))
 
-            # place the command line tool in SharedSupport
+            # place the command line tools in SharedSupport
             self.copy_file("app/plotdevice", BIN)
+            self.copy_file("app/bplotdevice", BIN)
+
+            for cmd in self.get_sub_commands():
+                self.run_command(cmd)
 
             # success!
             print "done building PlotDevice.app in ./dist"
@@ -286,7 +390,12 @@ def run(self):
     if 'py2app' in sys.argv:
         print """setup.py: py2app build failed
           Couldn't find the py2app module (perhaps because you've called setup.py from a virtualenv).
-          Make sure you're using the system's /usr/bin/python interpreter for py2app builds."""
+          Make sure you're not in a virtualenv directory or shell, and that you're using either:
+          
+              * Apple's system-installed python: /usr/bin/python -- or,
+              * A Homebrew python install: /usr/local/bin/python
+              
+          ... for py2app builds (The latter option should be a framework build). """
         sys.exit(1)
 
 
@@ -295,10 +404,10 @@ def run(self):
 class DistCommand(Command):
     description = "Create distributable zip of the app and an updated app.xml feed"
     user_options = []
-    def initialize_options(self):
-        pass
-    def finalize_options(self):
-        pass
+    def initialize_options(self): pass
+    def finalize_options(self): pass
+    sub_commands = Command.sub_commands[:]
+    sub_commands.append(('wheelhouse', lambda arg: True))
     def run(self):
         APP = 'dist/PlotDevice.app'
         ZIP = 'dist/PlotDevice_app-%s.zip' % VERSION
@@ -315,18 +424,24 @@ def run(self):
             CFBundleVersion = last_commit(),
             CFBundleShortVersionString = VERSION,
             SUFeedURL = 'http://plotdevice.io/app.xml',
-            SUEnableSystemProfiling = 'YES'
-        )
+            SUEnableSystemProfiling = 'YES')
+        
+        # Deal with installable frameworks:
+        FRAMEWORKS = join('app', 'Frameworks')
+        DITTO = which('ditto')
+        self.mkpath(FRAMEWORKS)
 
         # Download Sparkle (if necessary) and copy it into the bundle
-        ORIG = 'app/deps/Sparkle-%s/Sparkle.framework'%SPARKLE_VERSION
-        SPARKLE = join(APP,'Contents/Frameworks/Sparkle.framework')
+        ORIG = join(FRAMEWORKS, 'Sparkle-%s' % SPARKLE_VERSION, 'Sparkle.framework')
+        SPARKLE = join(APP, 'Contents', 'Frameworks', 'Sparkle.framework')
         if not exists(ORIG):
             print "Downloading Sparkle.framework"
-            self.mkpath('app/deps')
-            os.system('curl -L %s | bunzip2 -c | tar xf - -C app/deps'%SPARKLE_URL)
+            os.system('%(curl)s -L %(url)s | %(bz)s -c | %(tar)s xf - -C %(fw)s' % dict(
+                curl=which('curl'), url=SPARKLE_URL,
+                bz=which('bunzip2'),
+                tar=which('tar'), fw=FRAMEWORKS))
         self.mkpath(dirname(SPARKLE))
-        self.spawn(['ditto', ORIG, SPARKLE])
+        self.spawn([DITTO, ORIG, SPARKLE])
 
         # code-sign the app and sparkle bundles, then verify
         self.spawn(['codesign', '-f', '-v', '-s', "Developer ID Application", SPARKLE])
@@ -334,14 +449,17 @@ def run(self):
         self.spawn(['spctl', '--assess', '-v', 'dist/PlotDevice.app'])
 
         # create versioned zipfile of the app
-        self.spawn(['ditto','-ck', '--keepParent', APP, ZIP])
+        self.spawn([DITTO, '-ck', '--keepParent', APP, ZIP])
 
         # update the app.xml feed (pulled from the server)
-        release = dict(zipfile=basename(ZIP), bytes=os.path.getsize(ZIP),
+        release = dict(zipfile=basename(ZIP), bytes=getsize(ZIP),
                        version=VERSION, revision=last_commit(), now=timestamp())
         with file('dist/app.xml','w') as f:
             f.write(merged_feed(release))
 
+        for cmd in self.get_sub_commands():
+            self.run_command(cmd)
+
         print "\nBuilt PlotDevice.app, %s, and app.xml in ./dist" % basename(ZIP)
         print " -" + "\n -".join(commits_since(last_release(), raw=True))
         print "now edit dist/app.xml then run `python setup.py submit`."
@@ -350,90 +468,96 @@ def run(self):
 class SubmitCommand(Command):
     description = "Validate contents of dist subdir then send them to the net"
     user_options = []
-    def initialize_options(self):
-        pass
-    def finalize_options(self):
-        pass
+    def initialize_options(self): pass
+    def finalize_options(self): pass
     def run(self):
         print "Checking feed xml"
-        gosub('tidy -xml -utf8 -e dist/app.xml', on_err="app.xml didn't validate properly")
+        gosub('%s -xml -utf8 -e dist/app.xml' % which('tidy'),
+            on_err="app.xml didn't validate properly")
+
+        from xml.etree.ElementTree import parse
+        zipfile = 'dist/PlotDevice_app-%s.zip' % VERSION
+        SCP = which('scp')
 
-        tarfile = 'dist/plotdevice-%s.tar.gz'%VERSION
-        zipfile = 'dist/PlotDevice_app-%s.zip'%VERSION
-        from xml.etree.ElementTree import parse, dump
         for item in parse('dist/app.xml').getroot().iter('item'):
             release = item.find('enclosure').attrib
-            assert release['url'].endswith(basename(zipfile)), "Version mismatch: %s vs %r" % (zipfile, release['url'])
+            assert release['url'].endswith(basename(zipfile)), "Version mismatch: %s vs %r" % (
+                zipfile, release['url'])
             break
 
         # <confirmation y.n goes here>
 
         print "posting dist/app.xml"
-        gosub('scp dist/app.xml plotdevice.io:plod')
+        gosub('%s dist/app.xml plotdevice.io:plod' % SCP)
 
         print "posting", zipfile
-        gosub('scp %s plotdevice.io:plod/app'%zipfile)
+        gosub('%s %s plotdevice.io:plod/app' % (SCP, zipfile))
 
         # <upload to pypi goes here>
 
 ## Run Build ##
 
-if __name__=='__main__':
+if __name__ == '__main__':
     # make sure we're at the project root regardless of the cwd
     # (this means the various commands don't have to play path games)
     os.chdir(dirname(abspath(__file__)))
 
     # common config between module and app builds
     config = dict(
-        name = MODULE,
-        version = VERSION,
-        description = DESCRIPTION,
-        long_description = LONG_DESCRIPTION,
-        author = AUTHOR,
-        author_email = AUTHOR_EMAIL,
-        url = URL,
-        license = LICENSE,
-        classifiers = CLASSIFIERS,
-        packages = find_packages(),
-        scripts = ["app/plotdevice"],
+        name=MODULE,
+        version=VERSION,
+        description=DESCRIPTION,
+        long_description=LONG_DESCRIPTION,
+        author=AUTHOR,
+        author_email=AUTHOR_EMAIL,
+        url=URL,
+        license=LICENSE,
+        classifiers=CLASSIFIERS,
+        packages=find_packages(),
+        scripts=[
+            "app/plotdevice",
+            "app/bplotdevice"],
+        setup_requires=['wheel>=0.24.0'],
         zip_safe=False,
         cmdclass={
             'app': BuildAppCommand,
+            'wheelcache': WheelhouseCache,
+            'wheelhouse': WheelhouseToApp,
             'clean': CleanCommand,
             'build_py': BuildCommand,
             'dist': DistCommand,
             'sdist': BuildDistCommand,
             'submit': SubmitCommand,
-        },
-    )
+        })
 
-    # py2app-specific config
+    # py2app-specific config 
     if 'py2app' in sys.argv:
         config.update(dict(
-            app = [{
+            app=[{
                 'script': "app/plotdevice-app.py",
-                "plist":info_plist(),
+                "plist": info_plist(),
             }],
-            data_files = [
+            data_files=[
                 "app/Resources/ui",
                 "app/Resources/English.lproj",
                 "app/Resources/PlotDevice.icns",
                 "app/Resources/PlotDeviceFile.icns",
                 "examples",
             ],
-            options = {
+            options={
                 "py2app": {
                     "iconfile": "app/Resources/PlotDevice.icns",
-                    "semi_standalone":True,
-                    "site_packages":True,
-                    "strip":False,
+                    "semi_standalone": True,
+                    "site_packages": True,
+                    "strip": False,
                 }
             },
             cmdclass={
+                'wheelcache': WheelhouseCache,
+                'wheelhouse': WheelhouseToApp,
                 'build_py': BuildCommand,
                 'py2app': BuildPy2AppCommand,
-            }
-        ))
+            }))
 
     # begin the build process
     setup(**config)