diff --git a/build-all.sh b/build-all.sh
index f187fd1..663f556 100755
--- a/build-all.sh
+++ b/build-all.sh
@@ -3,13 +3,24 @@
 anvil -b build-browser.json
 anvil -b build-browser-diags.json
 
-cp ./lib/browser/postal.js ./example/amd/js/libs/postal/
-cp ./lib/browser/postal.diagnostics.js ./example/amd/js/libs/postal/
-cp ./lib/browser/postal.js ./example/standard/js/
-cp ./lib/browser/postal.diagnostics.js ./example/standard/js/
+mv ./lib/standard/postal.amd.js ./lib/amd/postal.js
+mv ./lib/standard/postal.amd.min.js ./lib/amd/postal.min.js
+mv ./lib/standard/postal.amd.min.gz.js ./lib/amd/postal.min.gz.js
+mv ./lib/standard/postal.diagnostics.amd.js ./lib/amd/postal.diagnostics.js
+mv ./lib/standard/postal.diagnostics.amd.min.js ./lib/amd/postal.diagnostics.min.js
+mv ./lib/standard/postal.diagnostics.amd.min.gz.js ./lib/amd/postal.diagnostics.min.gz.js
 
-mv ./lib/browser/postal.node.js ./lib/node/postal.js
-rm ./lib/browser/postal.node*
+mv ./lib/standard/postal.diagnostics.node.js ./lib/node/postal.diagnostics.js
+mv ./lib/standard/postal.node.js ./lib/node/postal.js
+rm ./lib/standard/postal.diagnostics.node*
+rm ./lib/standard/postal.node*
 
-mv ./lib/browser/postal.diagnostics.node.js ./lib/node/postal.diagnostics.js
-rm ./lib/browser/postal.diagnostics.node*
\ No newline at end of file
+mv ./lib/standard/postal.standard.js ./lib/standard/postal.js
+mv ./lib/standard/postal.standard.min.js ./lib/standard/postal.min.js
+mv ./lib/standard/postal.standard.min.gz.js ./lib/standard/postal.min.gz.js
+mv ./lib/standard/postal.diagnostics.standard.js ./lib/standard/postal.diagnostics.js
+mv ./lib/standard/postal.diagnostics.standard.min.js ./lib/standard/postal.diagnostics.min.js
+mv ./lib/standard/postal.diagnostics.standard.min.gz.js ./lib/standard/postal.diagnostics.min.gz.js
+
+cp ./lib/standard/postal.* ./example/standard/js
+cp ./lib/amd/postal.* ./example/amd/js/libs/postal
\ No newline at end of file
diff --git a/build-browser-diags.json b/build-browser-diags.json
index 9f41844..3891fae 100644
--- a/build-browser-diags.json
+++ b/build-browser-diags.json
@@ -1,6 +1,6 @@
 {
     "source": "src/diags",
-    "output": "lib/browser",
+    "output": "lib/standard",
     "lint": {},
     "uglify": {},
     "gzip": {},
diff --git a/build-browser.json b/build-browser.json
index 79d48de..01dc0dc 100644
--- a/build-browser.json
+++ b/build-browser.json
@@ -1,6 +1,6 @@
 {
     "source": "src/main",
-    "output": "lib/browser",
+    "output": "lib/standard",
     "lint": {},
     "uglify": {},
     "gzip": {},
diff --git a/example/amd/js/examples.js b/example/amd/js/examples.js
index ea146b6..f333a02 100644
--- a/example/amd/js/examples.js
+++ b/example/amd/js/examples.js
@@ -1,4 +1,5 @@
 define(['postal', 'postaldiags'], function(postal, diags){
+
 	// The world's simplest subscription
 	var channel = postal.channel("Name.Changed");
 	// subscribe
diff --git a/example/amd/js/libs/postal/postal.diagnostics.js b/example/amd/js/libs/postal/postal.diagnostics.js
index 5defd32..638c9b9 100644
--- a/example/amd/js/libs/postal/postal.diagnostics.js
+++ b/example/amd/js/libs/postal/postal.diagnostics.js
@@ -1,17 +1,10 @@
-(function(root, doc, factory) {
-	if (typeof define === "function" && define.amd) {
-		// AMD. Register as an anonymous module.
-		define(["postal", "underscore"], function(postal, _) {
-			return factory(postal, _, root, doc);
-		});
-	} else {
-		// Browser globals
-		factory(root.postal, root._, root, doc);
-	}
-}(this, document, function(postal, _, global, document, undefined) {
+// This is the amd module version of postal.diagnostics.js
+// If you need the standard lib version, go to http://github.com/ifandelse/postal.js
+define(["postal", "underscore"], function(postal, _, undefined) {
+
 
 	// this returns a callback that, if invoked, removes the wireTap
-	return postal.addWireTap(function(data, envelope) {
+	postal.diagnostics = postal.addWireTap(function(data, envelope) {
 		var all = _.extend(envelope, { data: data });
 		if(!JSON) {
 			throw "This browser or environment does not provide JSON support";
@@ -30,4 +23,5 @@
 		}
 	});
 
-}));
\ No newline at end of file
+
+});
\ No newline at end of file
diff --git a/example/amd/js/libs/postal/postal.diagnostics.min.gz.js b/example/amd/js/libs/postal/postal.diagnostics.min.gz.js
new file mode 100644
index 0000000..b0eb8fc
Binary files /dev/null and b/example/amd/js/libs/postal/postal.diagnostics.min.gz.js differ
diff --git a/example/amd/js/libs/postal/postal.diagnostics.min.js b/example/amd/js/libs/postal/postal.diagnostics.min.js
new file mode 100644
index 0000000..0033654
--- /dev/null
+++ b/example/amd/js/libs/postal/postal.diagnostics.min.js
@@ -0,0 +1 @@
+define(["postal","underscore"],function(a,b,c){a.diagnostics=a.addWireTap(function(a,c){var d=b.extend(c,{data:a});if(!JSON)throw"This browser or environment does not provide JSON support";try{console.log(JSON.stringify(d))}catch(e){try{d.data="ERROR: "+e.message,console.log(JSON.stringify(d))}catch(f){console.log("Unable to parse data to JSON: "+e)}}})})
\ No newline at end of file
diff --git a/example/amd/js/libs/postal/postal.js b/example/amd/js/libs/postal/postal.js
index 42e37e7..cf3714f 100644
--- a/example/amd/js/libs/postal/postal.js
+++ b/example/amd/js/libs/postal/postal.js
@@ -5,17 +5,9 @@
 	Version 0.6.0
  */
 
-(function(root, doc, factory) {
-	if (typeof define === "function" && define.amd) {
-		// AMD. Register as an anonymous module.
-		define(["underscore"], function(_) {
-			return factory(_, root, doc);
-		});
-	} else {
-		// Browser globals
-		factory(root._, root, doc);
-	}
-}(this, document, function(_, global, document, undefined) {
+// This is the amd-module version of postal.js
+// If you need the standard lib style version, go to http://github.com/ifandelse/postal.js
+define(["underscore"], function(_, undefined) {
 
 var DEFAULT_CHANNEL = "/",
 	DEFAULT_PRIORITY = 50,
@@ -414,6 +406,5 @@ var postal = {
 };
 
 
-	global.postal = postal;
 	return postal;
-}));
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/example/amd/js/libs/postal/postal.min.gz.js b/example/amd/js/libs/postal/postal.min.gz.js
new file mode 100644
index 0000000..7c92cc5
Binary files /dev/null and b/example/amd/js/libs/postal/postal.min.gz.js differ
diff --git a/example/amd/js/libs/postal/postal.min.js b/example/amd/js/libs/postal/postal.min.js
new file mode 100644
index 0000000..cfbebd7
--- /dev/null
+++ b/example/amd/js/libs/postal/postal.min.js
@@ -0,0 +1 @@
+define(["underscore"],function(a,b){var c="/",d=50,e=0,f="postal",g=function(){},h=function(){var b;return function(c){var d=!1;return a.isString(c)?(d=c===b,b=c):(d=a.isEqual(c,b),b=a.clone(c)),!d}},i=function(a,b){this.channel=a||c,this._topic=b||""};i.prototype={subscribe:function(){var a=arguments.length;if(a===1)return new j(this.channel,this._topic,arguments[0]);if(a===2)return new j(this.channel,arguments[0],arguments[1])},publish:function(a){var b={channel:this.channel,topic:this._topic,data:a};a.topic&&a.data&&(b=a,b.channel=b.channel||this.channel),b.timeStamp=new Date,n.configuration.bus.publish(b)},topic:function(a){return a===this._topic?this:new i(this.channel,a)}};var j=function(a,b,c){this.channel=a,this.topic=b,this.callback=c,this.priority=d,this.constraints=new Array(0),this.maxCalls=e,this.onHandled=g,this.context=null,n.configuration.bus.publish({channel:f,topic:"subscription.created",timeStamp:new Date,data:{event:"subscription.created",channel:a,topic:b}}),n.configuration.bus.subscribe(this)};j.prototype={unsubscribe:function(){n.configuration.bus.unsubscribe(this),n.configuration.bus.publish({channel:f,topic:"subscription.removed",timeStamp:new Date,data:{event:"subscription.removed",channel:this.channel,topic:this.topic}})},defer:function(){var a=this.callback;return this.callback=function(b){setTimeout(a,0,b)},this},disposeAfter:function(b){if(a.isNaN(b)||b<=0)throw"The value provided to disposeAfter (maxCalls) must be a number greater than zero.";var c=this.onHandled,d=a.after(b,a.bind(function(){this.unsubscribe(this)},this));return this.onHandled=function(){c.apply(this.context,arguments),d()},this},ignoreDuplicates:function(){return this.withConstraint(new h),this},withConstraint:function(b){if(!a.isFunction(b))throw"Predicate constraint must be a function";return this.constraints.push(b),this},withConstraints:function(b){var c=this;return a.isArray(b)&&a.each(b,function(a){c.withConstraint(a)}),c},withContext:function(a){return this.context=a,this},withDebounce:function(b){if(a.isNaN(b))throw"Milliseconds must be a number";var c=this.callback;return this.callback=a.debounce(c,b),this},withDelay:function(b){if(a.isNaN(b))throw"Milliseconds must be a number";var c=this.callback;return this.callback=function(a){setTimeout(function(){c(a)},b)},this},withPriority:function(b){if(a.isNaN(b))throw"Priority must be a number";return this.priority=b,this},withThrottle:function(b){if(a.isNaN(b))throw"Milliseconds must be a number";var c=this.callback;return this.callback=a.throttle(c,b),this},subscribe:function(a){return this.callback=a,this}};var k={cache:{},compare:function(a,b){if(this.cache[b]&&this.cache[b][a])return!0;var c=new RegExp("^"+a.replace(/\./g,"\\.").replace(/\*/g,".*").replace(/#/g,"[A-Z,a-z,0-9]*")+"$"),d=c.test(b);return d&&(this.cache[b]||(this.cache[b]={}),this.cache[b][a]=!0),d}},l={subscriptions:{},wireTaps:new Array(0),publish:function(b){a.each(this.wireTaps,function(a){a(b.data,b)}),a.each(this.subscriptions[b.channel],function(c){a.each(c,function(c){n.configuration.resolver.compare(c.topic,b.topic)&&a.all(c.constraints,function(a){return a(b.data)})&&typeof c.callback=="function"&&(c.callback.apply(c.context,[b.data,b]),c.onHandled())})})},subscribe:function(a){var b,c,d,e=this.subscriptions[a.channel],f;e||(e=this.subscriptions[a.channel]={}),f=this.subscriptions[a.channel][a.topic],f||(f=this.subscriptions[a.channel][a.topic]=new Array(0)),b=f.length-1;for(;b>=0;b--)if(f[b].priority<=a.priority){f.splice(b+1,0,a),c=!0;break}return c||f.unshift(a),a},unsubscribe:function(a){if(this.subscriptions[a.channel][a.topic]){var b=this.subscriptions[a.channel][a.topic].length,c=0;for(;c<b;c++)if(this.subscriptions[a.channel][a.topic][c]===a){this.subscriptions[a.channel][a.topic].splice(c,1);break}}},addWireTap:function(a){var b=this;return b.wireTaps.push(a),function(){var c=b.wireTaps.indexOf(a);c!==-1&&b.wireTaps.splice(c,1)}}},m={1:function(a){if(!a)throw new Error("publishing from the 'global' postal.publish call requires a valid envelope.");a.channel=a.channel||c,a.timeStamp=new Date,n.configuration.bus.publish(a)},2:function(a,b){n.configuration.bus.publish({channel:c,topic:a,timeStamp:new Date,data:b})},3:function(a,b,c){n.configuration.bus.publish({channel:a,topic:b,timeStamp:new Date,data:c})}};l.subscriptions[f]={};var n={configuration:{bus:l,resolver:k},channel:function(){var a=arguments.length,b=arguments[0],d=arguments[1];return a===1&&(Object.prototype.toString.call(b)==="[object String]"?(b=c,d=arguments[0]):(b=arguments[0].channel||c,d=arguments[0].topic)),new i(b,d)},subscribe:function(a){var b=a.callback,d=a.topic,e=a.channel||c;return new j(e,d,b)},publish:function(){var a=arguments.length;m[a]&&m[a].apply(this,arguments)},addWireTap:function(a){return this.configuration.bus.addWireTap(a)},linkChannels:function(b,d){var e=[];return a.isArray(b)||(b=[b]),a.isArray(d)||(d=[d]),a.each(b,function(b){var f=b.topic||"*";a.each(d,function(d){var f=d.channel||c;e.push(n.subscribe({channel:b.channel||c,topic:b.topic||"*",callback:function(b,c){var e=c;e.topic=a.isFunction(d.topic)?d.topic(c.topic):d.topic||c.topic,e.channel=f,e.data=b,n.publish(e)}}))})}),e},reset:function(){n.configuration.bus.subscriptions&&(n.configuration.bus.subscriptions={}),n.configuration.resolver.cache&&(n.configuration.resolver.cache={})}};return n})
\ No newline at end of file
diff --git a/example/amd/js/main.js b/example/amd/js/main.js
index 06e9393..a747fb6 100644
--- a/example/amd/js/main.js
+++ b/example/amd/js/main.js
@@ -7,8 +7,8 @@ require.config({
 	}
 });
 
-require(['jquery'], function($){
+require( [ 'jquery' ], function( $ ){
 	$(function(){
-		require(['examples']);
+		require( [ 'examples' ] );
 	});
 });
\ No newline at end of file
diff --git a/example/standard/js/postal.diagnostics.js b/example/standard/js/postal.diagnostics.js
index 5defd32..250d5bc 100644
--- a/example/standard/js/postal.diagnostics.js
+++ b/example/standard/js/postal.diagnostics.js
@@ -1,17 +1,10 @@
-(function(root, doc, factory) {
-	if (typeof define === "function" && define.amd) {
-		// AMD. Register as an anonymous module.
-		define(["postal", "underscore"], function(postal, _) {
-			return factory(postal, _, root, doc);
-		});
-	} else {
-		// Browser globals
-		factory(root.postal, root._, root, doc);
-	}
-}(this, document, function(postal, _, global, document, undefined) {
+// This is the standard lib version of postal.diagnostics.js
+// If you need the amd-module style version, go to http://github.com/ifandelse/postal.js
+(function(postal, _, undefined) {
+
 
 	// this returns a callback that, if invoked, removes the wireTap
-	return postal.addWireTap(function(data, envelope) {
+	postal.diagnostics = postal.addWireTap(function(data, envelope) {
 		var all = _.extend(envelope, { data: data });
 		if(!JSON) {
 			throw "This browser or environment does not provide JSON support";
@@ -30,4 +23,5 @@
 		}
 	});
 
-}));
\ No newline at end of file
+
+})( postal, _ );
\ No newline at end of file
diff --git a/example/standard/js/postal.diagnostics.min.gz.js b/example/standard/js/postal.diagnostics.min.gz.js
new file mode 100644
index 0000000..f3b96f2
Binary files /dev/null and b/example/standard/js/postal.diagnostics.min.gz.js differ
diff --git a/example/standard/js/postal.diagnostics.min.js b/example/standard/js/postal.diagnostics.min.js
new file mode 100644
index 0000000..dfd9e1b
--- /dev/null
+++ b/example/standard/js/postal.diagnostics.min.js
@@ -0,0 +1 @@
+(function(a,b,c){a.diagnostics=a.addWireTap(function(a,c){var d=b.extend(c,{data:a});if(!JSON)throw"This browser or environment does not provide JSON support";try{console.log(JSON.stringify(d))}catch(e){try{d.data="ERROR: "+e.message,console.log(JSON.stringify(d))}catch(f){console.log("Unable to parse data to JSON: "+e)}}})})(postal,_)
\ No newline at end of file
diff --git a/example/standard/js/postal.js b/example/standard/js/postal.js
index 42e37e7..0ab368f 100644
--- a/example/standard/js/postal.js
+++ b/example/standard/js/postal.js
@@ -5,17 +5,9 @@
 	Version 0.6.0
  */
 
-(function(root, doc, factory) {
-	if (typeof define === "function" && define.amd) {
-		// AMD. Register as an anonymous module.
-		define(["underscore"], function(_) {
-			return factory(_, root, doc);
-		});
-	} else {
-		// Browser globals
-		factory(root._, root, doc);
-	}
-}(this, document, function(_, global, document, undefined) {
+// This is the standard lib version of postal.js
+// If you need the amd-module style version, go to http://github.com/ifandelse/postal.js
+(function(_, global, undefined) {
 
 var DEFAULT_CHANNEL = "/",
 	DEFAULT_PRIORITY = 50,
@@ -415,5 +407,5 @@ var postal = {
 
 
 	global.postal = postal;
-	return postal;
-}));
\ No newline at end of file
+
+})(_, window);
\ No newline at end of file
diff --git a/example/standard/js/postal.min.gz.js b/example/standard/js/postal.min.gz.js
new file mode 100644
index 0000000..363d7e0
Binary files /dev/null and b/example/standard/js/postal.min.gz.js differ
diff --git a/example/standard/js/postal.min.js b/example/standard/js/postal.min.js
new file mode 100644
index 0000000..6298587
--- /dev/null
+++ b/example/standard/js/postal.min.js
@@ -0,0 +1 @@
+(function(a,b,c){var d="/",e=50,f=0,g="postal",h=function(){},i=function(){var b;return function(c){var d=!1;return a.isString(c)?(d=c===b,b=c):(d=a.isEqual(c,b),b=a.clone(c)),!d}},j=function(a,b){this.channel=a||d,this._topic=b||""};j.prototype={subscribe:function(){var a=arguments.length;if(a===1)return new k(this.channel,this._topic,arguments[0]);if(a===2)return new k(this.channel,arguments[0],arguments[1])},publish:function(a){var b={channel:this.channel,topic:this._topic,data:a};a.topic&&a.data&&(b=a,b.channel=b.channel||this.channel),b.timeStamp=new Date,o.configuration.bus.publish(b)},topic:function(a){return a===this._topic?this:new j(this.channel,a)}};var k=function(a,b,c){this.channel=a,this.topic=b,this.callback=c,this.priority=e,this.constraints=new Array(0),this.maxCalls=f,this.onHandled=h,this.context=null,o.configuration.bus.publish({channel:g,topic:"subscription.created",timeStamp:new Date,data:{event:"subscription.created",channel:a,topic:b}}),o.configuration.bus.subscribe(this)};k.prototype={unsubscribe:function(){o.configuration.bus.unsubscribe(this),o.configuration.bus.publish({channel:g,topic:"subscription.removed",timeStamp:new Date,data:{event:"subscription.removed",channel:this.channel,topic:this.topic}})},defer:function(){var a=this.callback;return this.callback=function(b){setTimeout(a,0,b)},this},disposeAfter:function(b){if(a.isNaN(b)||b<=0)throw"The value provided to disposeAfter (maxCalls) must be a number greater than zero.";var c=this.onHandled,d=a.after(b,a.bind(function(){this.unsubscribe(this)},this));return this.onHandled=function(){c.apply(this.context,arguments),d()},this},ignoreDuplicates:function(){return this.withConstraint(new i),this},withConstraint:function(b){if(!a.isFunction(b))throw"Predicate constraint must be a function";return this.constraints.push(b),this},withConstraints:function(b){var c=this;return a.isArray(b)&&a.each(b,function(a){c.withConstraint(a)}),c},withContext:function(a){return this.context=a,this},withDebounce:function(b){if(a.isNaN(b))throw"Milliseconds must be a number";var c=this.callback;return this.callback=a.debounce(c,b),this},withDelay:function(b){if(a.isNaN(b))throw"Milliseconds must be a number";var c=this.callback;return this.callback=function(a){setTimeout(function(){c(a)},b)},this},withPriority:function(b){if(a.isNaN(b))throw"Priority must be a number";return this.priority=b,this},withThrottle:function(b){if(a.isNaN(b))throw"Milliseconds must be a number";var c=this.callback;return this.callback=a.throttle(c,b),this},subscribe:function(a){return this.callback=a,this}};var l={cache:{},compare:function(a,b){if(this.cache[b]&&this.cache[b][a])return!0;var c=new RegExp("^"+a.replace(/\./g,"\\.").replace(/\*/g,".*").replace(/#/g,"[A-Z,a-z,0-9]*")+"$"),d=c.test(b);return d&&(this.cache[b]||(this.cache[b]={}),this.cache[b][a]=!0),d}},m={subscriptions:{},wireTaps:new Array(0),publish:function(b){a.each(this.wireTaps,function(a){a(b.data,b)}),a.each(this.subscriptions[b.channel],function(c){a.each(c,function(c){o.configuration.resolver.compare(c.topic,b.topic)&&a.all(c.constraints,function(a){return a(b.data)})&&typeof c.callback=="function"&&(c.callback.apply(c.context,[b.data,b]),c.onHandled())})})},subscribe:function(a){var b,c,d,e=this.subscriptions[a.channel],f;e||(e=this.subscriptions[a.channel]={}),f=this.subscriptions[a.channel][a.topic],f||(f=this.subscriptions[a.channel][a.topic]=new Array(0)),b=f.length-1;for(;b>=0;b--)if(f[b].priority<=a.priority){f.splice(b+1,0,a),c=!0;break}return c||f.unshift(a),a},unsubscribe:function(a){if(this.subscriptions[a.channel][a.topic]){var b=this.subscriptions[a.channel][a.topic].length,c=0;for(;c<b;c++)if(this.subscriptions[a.channel][a.topic][c]===a){this.subscriptions[a.channel][a.topic].splice(c,1);break}}},addWireTap:function(a){var b=this;return b.wireTaps.push(a),function(){var c=b.wireTaps.indexOf(a);c!==-1&&b.wireTaps.splice(c,1)}}},n={1:function(a){if(!a)throw new Error("publishing from the 'global' postal.publish call requires a valid envelope.");a.channel=a.channel||d,a.timeStamp=new Date,o.configuration.bus.publish(a)},2:function(a,b){o.configuration.bus.publish({channel:d,topic:a,timeStamp:new Date,data:b})},3:function(a,b,c){o.configuration.bus.publish({channel:a,topic:b,timeStamp:new Date,data:c})}};m.subscriptions[g]={};var o={configuration:{bus:m,resolver:l},channel:function(){var a=arguments.length,b=arguments[0],c=arguments[1];return a===1&&(Object.prototype.toString.call(b)==="[object String]"?(b=d,c=arguments[0]):(b=arguments[0].channel||d,c=arguments[0].topic)),new j(b,c)},subscribe:function(a){var b=a.callback,c=a.topic,e=a.channel||d;return new k(e,c,b)},publish:function(){var a=arguments.length;n[a]&&n[a].apply(this,arguments)},addWireTap:function(a){return this.configuration.bus.addWireTap(a)},linkChannels:function(b,c){var e=[];return a.isArray(b)||(b=[b]),a.isArray(c)||(c=[c]),a.each(b,function(b){var f=b.topic||"*";a.each(c,function(c){var f=c.channel||d;e.push(o.subscribe({channel:b.channel||d,topic:b.topic||"*",callback:function(b,d){var e=d;e.topic=a.isFunction(c.topic)?c.topic(d.topic):c.topic||d.topic,e.channel=f,e.data=b,o.publish(e)}}))})}),e},reset:function(){o.configuration.bus.subscriptions&&(o.configuration.bus.subscriptions={}),o.configuration.resolver.cache&&(o.configuration.resolver.cache={})}};b.postal=o})(_,window)
\ No newline at end of file
diff --git a/lib/browser/postal.diagnostics.js b/lib/amd/postal.diagnostics.js
similarity index 51%
rename from lib/browser/postal.diagnostics.js
rename to lib/amd/postal.diagnostics.js
index 5defd32..638c9b9 100644
--- a/lib/browser/postal.diagnostics.js
+++ b/lib/amd/postal.diagnostics.js
@@ -1,17 +1,10 @@
-(function(root, doc, factory) {
-	if (typeof define === "function" && define.amd) {
-		// AMD. Register as an anonymous module.
-		define(["postal", "underscore"], function(postal, _) {
-			return factory(postal, _, root, doc);
-		});
-	} else {
-		// Browser globals
-		factory(root.postal, root._, root, doc);
-	}
-}(this, document, function(postal, _, global, document, undefined) {
+// This is the amd module version of postal.diagnostics.js
+// If you need the standard lib version, go to http://github.com/ifandelse/postal.js
+define(["postal", "underscore"], function(postal, _, undefined) {
+
 
 	// this returns a callback that, if invoked, removes the wireTap
-	return postal.addWireTap(function(data, envelope) {
+	postal.diagnostics = postal.addWireTap(function(data, envelope) {
 		var all = _.extend(envelope, { data: data });
 		if(!JSON) {
 			throw "This browser or environment does not provide JSON support";
@@ -30,4 +23,5 @@
 		}
 	});
 
-}));
\ No newline at end of file
+
+});
\ No newline at end of file
diff --git a/lib/amd/postal.diagnostics.min.gz.js b/lib/amd/postal.diagnostics.min.gz.js
new file mode 100644
index 0000000..b0eb8fc
Binary files /dev/null and b/lib/amd/postal.diagnostics.min.gz.js differ
diff --git a/lib/amd/postal.diagnostics.min.js b/lib/amd/postal.diagnostics.min.js
new file mode 100644
index 0000000..0033654
--- /dev/null
+++ b/lib/amd/postal.diagnostics.min.js
@@ -0,0 +1 @@
+define(["postal","underscore"],function(a,b,c){a.diagnostics=a.addWireTap(function(a,c){var d=b.extend(c,{data:a});if(!JSON)throw"This browser or environment does not provide JSON support";try{console.log(JSON.stringify(d))}catch(e){try{d.data="ERROR: "+e.message,console.log(JSON.stringify(d))}catch(f){console.log("Unable to parse data to JSON: "+e)}}})})
\ No newline at end of file
diff --git a/lib/amd/postal.js b/lib/amd/postal.js
new file mode 100644
index 0000000..cf3714f
--- /dev/null
+++ b/lib/amd/postal.js
@@ -0,0 +1,410 @@
+/*
+	postal.js
+	Author: Jim Cowart
+	License: Dual licensed MIT (http://www.opensource.org/licenses/mit-license) & GPL (http://www.opensource.org/licenses/gpl-license)
+	Version 0.6.0
+ */
+
+// This is the amd-module version of postal.js
+// If you need the standard lib style version, go to http://github.com/ifandelse/postal.js
+define(["underscore"], function(_, undefined) {
+
+var DEFAULT_CHANNEL = "/",
+	DEFAULT_PRIORITY = 50,
+	DEFAULT_DISPOSEAFTER = 0,
+	SYSTEM_CHANNEL = "postal",
+	NO_OP = function() { };
+
+var DistinctPredicate = function() {
+	var previous;
+	return function(data) {
+		var eq = false;
+		if(_.isString(data)) {
+			eq = data === previous;
+			previous = data;
+		}
+		else {
+			eq = _.isEqual(data, previous);
+			previous = _.clone(data);
+		}
+		return !eq;
+	};
+};
+
+var ChannelDefinition = function(channelName, defaultTopic) {
+	this.channel = channelName || DEFAULT_CHANNEL;
+	this._topic = defaultTopic || "";
+};
+
+ChannelDefinition.prototype = {
+	subscribe: function() {
+		var len = arguments.length;
+		if(len === 1) {
+			return new SubscriptionDefinition(this.channel, this._topic, arguments[0]);
+		}
+		else if (len === 2) {
+			return new SubscriptionDefinition(this.channel, arguments[0], arguments[1]);
+		}
+	},
+
+	publish: function(obj) {
+		var envelope = {
+			channel: this.channel,
+			topic: this._topic,
+			data: obj
+		};
+		// If this is an envelope....
+		if( obj.topic && obj.data ) {
+			envelope = obj;
+			envelope.channel = envelope.channel || this.channel;
+		}
+		envelope.timeStamp = new Date();
+		postal.configuration.bus.publish(envelope);
+	},
+
+	topic: function(topic) {
+		if(topic === this._topic) {
+			return this;
+		}
+		return new ChannelDefinition(this.channel, topic);
+	}
+};
+
+var SubscriptionDefinition = function(channel, topic, callback) {
+	this.channel = channel;
+	this.topic = topic;
+	this.callback = callback;
+	this.priority = DEFAULT_PRIORITY;
+	this.constraints = new Array(0);
+	this.maxCalls = DEFAULT_DISPOSEAFTER;
+	this.onHandled = NO_OP;
+	this.context = null;
+	postal.configuration.bus.publish({
+		channel: SYSTEM_CHANNEL,
+		topic: "subscription.created",
+		timeStamp: new Date(),
+		data: {
+			event: "subscription.created",
+			channel: channel,
+			topic: topic
+		}
+	});
+
+	postal.configuration.bus.subscribe(this);
+
+};
+
+SubscriptionDefinition.prototype = {
+	unsubscribe: function() {
+		postal.configuration.bus.unsubscribe(this);
+		postal.configuration.bus.publish({
+			channel: SYSTEM_CHANNEL,
+			topic: "subscription.removed",
+			timeStamp: new Date(),
+			data: {
+				event: "subscription.removed",
+				channel: this.channel,
+				topic: this.topic
+			}
+		});
+	},
+
+	defer: function() {
+		var fn = this.callback;
+		this.callback = function(data) {
+			setTimeout(fn,0,data);
+		};
+		return this;
+	},
+
+	disposeAfter: function(maxCalls) {
+		if(_.isNaN(maxCalls) || maxCalls <= 0) {
+			throw "The value provided to disposeAfter (maxCalls) must be a number greater than zero.";
+		}
+
+		var fn = this.onHandled;
+		var dispose = _.after(maxCalls, _.bind(function() {
+			this.unsubscribe(this);
+		}, this));
+
+		this.onHandled = function() {
+			fn.apply(this.context, arguments);
+			dispose();
+		};
+		return this;
+	},
+
+	ignoreDuplicates: function() {
+		this.withConstraint(new DistinctPredicate());
+		return this;
+	},
+
+	withConstraint: function(predicate) {
+		if(! _.isFunction(predicate)) {
+			throw "Predicate constraint must be a function";
+		}
+		this.constraints.push(predicate);
+		return this;
+	},
+
+	withConstraints: function(predicates) {
+		var self = this;
+		if(_.isArray(predicates)) {
+			_.each(predicates, function(predicate) { self.withConstraint(predicate); } );
+		}
+		return self;
+	},
+
+	withContext: function(context) {
+		this.context = context;
+		return this;
+	},
+
+	withDebounce: function(milliseconds) {
+		if(_.isNaN(milliseconds)) {
+			throw "Milliseconds must be a number";
+		}
+		var fn = this.callback;
+		this.callback = _.debounce(fn, milliseconds);
+		return this;
+	},
+
+	withDelay: function(milliseconds) {
+		if(_.isNaN(milliseconds)) {
+			throw "Milliseconds must be a number";
+		}
+		var fn = this.callback;
+		this.callback = function(data) {
+			setTimeout(function(){
+				fn(data);
+			}, milliseconds);
+		};
+		return this;
+	},
+
+	withPriority: function(priority) {
+		if(_.isNaN(priority)) {
+			throw "Priority must be a number";
+		}
+		this.priority = priority;
+		return this;
+	},
+
+	withThrottle: function(milliseconds) {
+		if(_.isNaN(milliseconds)) {
+			throw "Milliseconds must be a number";
+		}
+		var fn = this.callback;
+		this.callback = _.throttle(fn, milliseconds);
+		return this;
+	},
+
+	subscribe: function(callback) {
+		this.callback = callback;
+		return this;
+	}
+};
+
+var bindingsResolver = {
+	cache: { },
+
+	compare: function(binding, topic) {
+		if(this.cache[topic] && this.cache[topic][binding]) {
+			return true;
+		}
+		//  binding.replace(/\./g,"\\.")             // escape actual periods
+		//         .replace(/\*/g, ".*")             // asterisks match any value
+		//         .replace(/#/g, "[A-Z,a-z,0-9]*"); // hash matches any alpha-numeric 'word'
+		var rgx = new RegExp("^" + binding.replace(/\./g,"\\.").replace(/\*/g, ".*").replace(/#/g, "[A-Z,a-z,0-9]*") + "$"),
+			result = rgx.test(topic);
+		if(result) {
+			if(!this.cache[topic]) {
+				this.cache[topic] = {};
+			}
+			this.cache[topic][binding] = true;
+		}
+		return result;
+	}
+};
+
+var localBus = {
+
+	subscriptions: {},
+
+	wireTaps: new Array(0),
+
+	publish: function(envelope) {
+		_.each(this.wireTaps,function(tap) {
+			tap(envelope.data, envelope);
+		});
+
+		_.each(this.subscriptions[envelope.channel], function(topic) {
+			_.each(topic, function(subDef){
+				if(postal.configuration.resolver.compare(subDef.topic, envelope.topic)) {
+					if(_.all(subDef.constraints, function(constraint) { return constraint(envelope.data); })) {
+						if(typeof subDef.callback === 'function') {
+							subDef.callback.apply(subDef.context, [envelope.data, envelope]);
+							subDef.onHandled();
+						}
+					}
+				}
+			});
+		});
+	},
+
+	subscribe: function(subDef) {
+		var idx, found, fn, channel = this.subscriptions[subDef.channel], subs;
+
+		if(!channel) {
+			channel = this.subscriptions[subDef.channel] = {};
+		}
+		subs = this.subscriptions[subDef.channel][subDef.topic];
+		if(!subs) {
+			subs = this.subscriptions[subDef.channel][subDef.topic] = new Array(0);
+		}
+
+		idx = subs.length - 1;
+		for(; idx >= 0; idx--) {
+			if(subs[idx].priority <= subDef.priority) {
+				subs.splice(idx + 1, 0, subDef);
+				found = true;
+				break;
+			}
+		}
+		if(!found) {
+			subs.unshift(subDef);
+		}
+		return subDef;
+	},
+
+	unsubscribe: function(config) {
+		if(this.subscriptions[config.channel][config.topic]) {
+			var len = this.subscriptions[config.channel][config.topic].length,
+				idx = 0;
+			for ( ; idx < len; idx++ ) {
+				if (this.subscriptions[config.channel][config.topic][idx] === config) {
+					this.subscriptions[config.channel][config.topic].splice( idx, 1 );
+					break;
+				}
+			}
+		}
+	},
+
+	addWireTap: function(callback) {
+		var self = this;
+		self.wireTaps.push(callback);
+		return function() {
+			var idx = self.wireTaps.indexOf(callback);
+			if(idx !== -1) {
+				self.wireTaps.splice(idx,1);
+			}
+		};
+	}
+};
+
+var publishPicker = {
+	"1" : function(envelope) {
+		if(!envelope) {
+			throw new Error("publishing from the 'global' postal.publish call requires a valid envelope.");
+		}
+		envelope.channel = envelope.channel || DEFAULT_CHANNEL;
+		envelope.timeStamp = new Date();
+		postal.configuration.bus.publish(envelope);
+	},
+	"2" : function(topic, data) {
+		postal.configuration.bus.publish({ channel: DEFAULT_CHANNEL, topic: topic, timeStamp: new Date(), data: data });
+	},
+	"3" : function(channel, topic, data) {
+		postal.configuration.bus.publish({ channel: channel, topic: topic, timeStamp: new Date(), data: data });
+	}
+};
+
+// save some setup time, albeit tiny
+localBus.subscriptions[SYSTEM_CHANNEL] = {};
+
+var postal = {
+	configuration: {
+		bus: localBus,
+		resolver: bindingsResolver
+	},
+
+	channel: function() {
+		var len = arguments.length,
+			channel = arguments[0],
+			tpc = arguments[1];
+		if(len === 1) {
+			if(Object.prototype.toString.call(channel) === "[object String]") {
+				channel = DEFAULT_CHANNEL;
+				tpc = arguments[0];
+			}
+			else {
+				channel = arguments[0].channel || DEFAULT_CHANNEL;
+				tpc = arguments[0].topic;
+			}
+		}
+		return new ChannelDefinition(channel, tpc);
+	},
+
+	subscribe: function(options) {
+		var callback = options.callback,
+			topic = options.topic,
+			channel = options.channel || DEFAULT_CHANNEL;
+		return new SubscriptionDefinition(channel, topic, callback);
+	},
+
+	publish: function() {
+		var len = arguments.length;
+		if(publishPicker[len]) {
+			publishPicker[len].apply(this, arguments);
+		}
+	},
+
+	addWireTap: function(callback) {
+		return this.configuration.bus.addWireTap(callback);
+	},
+
+	linkChannels: function(sources, destinations) {
+		var result = [];
+		if(!_.isArray(sources)) {
+			sources = [sources];
+		}
+		if(!_.isArray(destinations)) {
+			destinations = [destinations];
+		}
+		_.each(sources, function(source){
+			var sourceTopic = source.topic || "*";
+			_.each(destinations, function(destination) {
+				var destChannel = destination.channel || DEFAULT_CHANNEL;
+				result.push(
+					postal.subscribe({
+						channel: source.channel || DEFAULT_CHANNEL,
+						topic: source.topic || "*",
+						callback : function(data, env) {
+							var newEnv = env;
+							newEnv.topic = _.isFunction(destination.topic) ? destination.topic(env.topic) : destination.topic || env.topic;
+							newEnv.channel = destChannel;
+							newEnv.data = data;
+							postal.publish(newEnv);
+						}
+					})
+				);
+			});
+		});
+		return result;
+	},
+
+	reset: function() {
+		// we check first in case a custom bus or resolver
+		// doesn't expose subscriptions or a resolver cache
+		if(postal.configuration.bus.subscriptions) {
+			postal.configuration.bus.subscriptions = {};
+		}
+		if(postal.configuration.resolver.cache) {
+			postal.configuration.resolver.cache = {};
+		}
+	}
+};
+
+
+	return postal;
+});
\ No newline at end of file
diff --git a/lib/amd/postal.min.gz.js b/lib/amd/postal.min.gz.js
new file mode 100644
index 0000000..7c92cc5
Binary files /dev/null and b/lib/amd/postal.min.gz.js differ
diff --git a/lib/amd/postal.min.js b/lib/amd/postal.min.js
new file mode 100644
index 0000000..cfbebd7
--- /dev/null
+++ b/lib/amd/postal.min.js
@@ -0,0 +1 @@
+define(["underscore"],function(a,b){var c="/",d=50,e=0,f="postal",g=function(){},h=function(){var b;return function(c){var d=!1;return a.isString(c)?(d=c===b,b=c):(d=a.isEqual(c,b),b=a.clone(c)),!d}},i=function(a,b){this.channel=a||c,this._topic=b||""};i.prototype={subscribe:function(){var a=arguments.length;if(a===1)return new j(this.channel,this._topic,arguments[0]);if(a===2)return new j(this.channel,arguments[0],arguments[1])},publish:function(a){var b={channel:this.channel,topic:this._topic,data:a};a.topic&&a.data&&(b=a,b.channel=b.channel||this.channel),b.timeStamp=new Date,n.configuration.bus.publish(b)},topic:function(a){return a===this._topic?this:new i(this.channel,a)}};var j=function(a,b,c){this.channel=a,this.topic=b,this.callback=c,this.priority=d,this.constraints=new Array(0),this.maxCalls=e,this.onHandled=g,this.context=null,n.configuration.bus.publish({channel:f,topic:"subscription.created",timeStamp:new Date,data:{event:"subscription.created",channel:a,topic:b}}),n.configuration.bus.subscribe(this)};j.prototype={unsubscribe:function(){n.configuration.bus.unsubscribe(this),n.configuration.bus.publish({channel:f,topic:"subscription.removed",timeStamp:new Date,data:{event:"subscription.removed",channel:this.channel,topic:this.topic}})},defer:function(){var a=this.callback;return this.callback=function(b){setTimeout(a,0,b)},this},disposeAfter:function(b){if(a.isNaN(b)||b<=0)throw"The value provided to disposeAfter (maxCalls) must be a number greater than zero.";var c=this.onHandled,d=a.after(b,a.bind(function(){this.unsubscribe(this)},this));return this.onHandled=function(){c.apply(this.context,arguments),d()},this},ignoreDuplicates:function(){return this.withConstraint(new h),this},withConstraint:function(b){if(!a.isFunction(b))throw"Predicate constraint must be a function";return this.constraints.push(b),this},withConstraints:function(b){var c=this;return a.isArray(b)&&a.each(b,function(a){c.withConstraint(a)}),c},withContext:function(a){return this.context=a,this},withDebounce:function(b){if(a.isNaN(b))throw"Milliseconds must be a number";var c=this.callback;return this.callback=a.debounce(c,b),this},withDelay:function(b){if(a.isNaN(b))throw"Milliseconds must be a number";var c=this.callback;return this.callback=function(a){setTimeout(function(){c(a)},b)},this},withPriority:function(b){if(a.isNaN(b))throw"Priority must be a number";return this.priority=b,this},withThrottle:function(b){if(a.isNaN(b))throw"Milliseconds must be a number";var c=this.callback;return this.callback=a.throttle(c,b),this},subscribe:function(a){return this.callback=a,this}};var k={cache:{},compare:function(a,b){if(this.cache[b]&&this.cache[b][a])return!0;var c=new RegExp("^"+a.replace(/\./g,"\\.").replace(/\*/g,".*").replace(/#/g,"[A-Z,a-z,0-9]*")+"$"),d=c.test(b);return d&&(this.cache[b]||(this.cache[b]={}),this.cache[b][a]=!0),d}},l={subscriptions:{},wireTaps:new Array(0),publish:function(b){a.each(this.wireTaps,function(a){a(b.data,b)}),a.each(this.subscriptions[b.channel],function(c){a.each(c,function(c){n.configuration.resolver.compare(c.topic,b.topic)&&a.all(c.constraints,function(a){return a(b.data)})&&typeof c.callback=="function"&&(c.callback.apply(c.context,[b.data,b]),c.onHandled())})})},subscribe:function(a){var b,c,d,e=this.subscriptions[a.channel],f;e||(e=this.subscriptions[a.channel]={}),f=this.subscriptions[a.channel][a.topic],f||(f=this.subscriptions[a.channel][a.topic]=new Array(0)),b=f.length-1;for(;b>=0;b--)if(f[b].priority<=a.priority){f.splice(b+1,0,a),c=!0;break}return c||f.unshift(a),a},unsubscribe:function(a){if(this.subscriptions[a.channel][a.topic]){var b=this.subscriptions[a.channel][a.topic].length,c=0;for(;c<b;c++)if(this.subscriptions[a.channel][a.topic][c]===a){this.subscriptions[a.channel][a.topic].splice(c,1);break}}},addWireTap:function(a){var b=this;return b.wireTaps.push(a),function(){var c=b.wireTaps.indexOf(a);c!==-1&&b.wireTaps.splice(c,1)}}},m={1:function(a){if(!a)throw new Error("publishing from the 'global' postal.publish call requires a valid envelope.");a.channel=a.channel||c,a.timeStamp=new Date,n.configuration.bus.publish(a)},2:function(a,b){n.configuration.bus.publish({channel:c,topic:a,timeStamp:new Date,data:b})},3:function(a,b,c){n.configuration.bus.publish({channel:a,topic:b,timeStamp:new Date,data:c})}};l.subscriptions[f]={};var n={configuration:{bus:l,resolver:k},channel:function(){var a=arguments.length,b=arguments[0],d=arguments[1];return a===1&&(Object.prototype.toString.call(b)==="[object String]"?(b=c,d=arguments[0]):(b=arguments[0].channel||c,d=arguments[0].topic)),new i(b,d)},subscribe:function(a){var b=a.callback,d=a.topic,e=a.channel||c;return new j(e,d,b)},publish:function(){var a=arguments.length;m[a]&&m[a].apply(this,arguments)},addWireTap:function(a){return this.configuration.bus.addWireTap(a)},linkChannels:function(b,d){var e=[];return a.isArray(b)||(b=[b]),a.isArray(d)||(d=[d]),a.each(b,function(b){var f=b.topic||"*";a.each(d,function(d){var f=d.channel||c;e.push(n.subscribe({channel:b.channel||c,topic:b.topic||"*",callback:function(b,c){var e=c;e.topic=a.isFunction(d.topic)?d.topic(c.topic):d.topic||c.topic,e.channel=f,e.data=b,n.publish(e)}}))})}),e},reset:function(){n.configuration.bus.subscriptions&&(n.configuration.bus.subscriptions={}),n.configuration.resolver.cache&&(n.configuration.resolver.cache={})}};return n})
\ No newline at end of file
diff --git a/lib/browser/postal.diagnostics.min.gz.js b/lib/browser/postal.diagnostics.min.gz.js
deleted file mode 100644
index c5d50e3..0000000
Binary files a/lib/browser/postal.diagnostics.min.gz.js and /dev/null differ
diff --git a/lib/browser/postal.diagnostics.min.js b/lib/browser/postal.diagnostics.min.js
deleted file mode 100644
index 6dffe94..0000000
--- a/lib/browser/postal.diagnostics.min.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(a,b,c){typeof define=="function"&&define.amd?define(["postal","underscore"],function(d,e){return c(d,e,a,b)}):c(a.postal,a._,a,b)})(this,document,function(a,b,c,d,e){return a.addWireTap(function(a,c){var d=b.extend(c,{data:a});if(!JSON)throw"This browser or environment does not provide JSON support";try{console.log(JSON.stringify(d))}catch(e){try{d.data="ERROR: "+e.message,console.log(JSON.stringify(d))}catch(f){console.log("Unable to parse data to JSON: "+e)}}})})
\ No newline at end of file
diff --git a/lib/browser/postal.min.gz.js b/lib/browser/postal.min.gz.js
deleted file mode 100644
index 283f9c5..0000000
Binary files a/lib/browser/postal.min.gz.js and /dev/null differ
diff --git a/lib/browser/postal.min.js b/lib/browser/postal.min.js
deleted file mode 100644
index 261f99e..0000000
--- a/lib/browser/postal.min.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(a,b,c){typeof define=="function"&&define.amd?define(["underscore"],function(d){return c(d,a,b)}):c(a._,a,b)})(this,document,function(a,b,c,d){var e="/",f=50,g=0,h="postal",i=function(){},j=function(){var b;return function(c){var d=!1;return a.isString(c)?(d=c===b,b=c):(d=a.isEqual(c,b),b=a.clone(c)),!d}},k=function(a,b){this.channel=a||e,this._topic=b||""};k.prototype={subscribe:function(){var a=arguments.length;if(a===1)return new l(this.channel,this._topic,arguments[0]);if(a===2)return new l(this.channel,arguments[0],arguments[1])},publish:function(a){var b={channel:this.channel,topic:this._topic,data:a};a.topic&&a.data&&(b=a,b.channel=b.channel||this.channel),b.timeStamp=new Date,p.configuration.bus.publish(b)},topic:function(a){return a===this._topic?this:new k(this.channel,a)}};var l=function(a,b,c){this.channel=a,this.topic=b,this.callback=c,this.priority=f,this.constraints=new Array(0),this.maxCalls=g,this.onHandled=i,this.context=null,p.configuration.bus.publish({channel:h,topic:"subscription.created",timeStamp:new Date,data:{event:"subscription.created",channel:a,topic:b}}),p.configuration.bus.subscribe(this)};l.prototype={unsubscribe:function(){p.configuration.bus.unsubscribe(this),p.configuration.bus.publish({channel:h,topic:"subscription.removed",timeStamp:new Date,data:{event:"subscription.removed",channel:this.channel,topic:this.topic}})},defer:function(){var a=this.callback;return this.callback=function(b){setTimeout(a,0,b)},this},disposeAfter:function(b){if(a.isNaN(b)||b<=0)throw"The value provided to disposeAfter (maxCalls) must be a number greater than zero.";var c=this.onHandled,d=a.after(b,a.bind(function(){this.unsubscribe(this)},this));return this.onHandled=function(){c.apply(this.context,arguments),d()},this},ignoreDuplicates:function(){return this.withConstraint(new j),this},withConstraint:function(b){if(!a.isFunction(b))throw"Predicate constraint must be a function";return this.constraints.push(b),this},withConstraints:function(b){var c=this;return a.isArray(b)&&a.each(b,function(a){c.withConstraint(a)}),c},withContext:function(a){return this.context=a,this},withDebounce:function(b){if(a.isNaN(b))throw"Milliseconds must be a number";var c=this.callback;return this.callback=a.debounce(c,b),this},withDelay:function(b){if(a.isNaN(b))throw"Milliseconds must be a number";var c=this.callback;return this.callback=function(a){setTimeout(function(){c(a)},b)},this},withPriority:function(b){if(a.isNaN(b))throw"Priority must be a number";return this.priority=b,this},withThrottle:function(b){if(a.isNaN(b))throw"Milliseconds must be a number";var c=this.callback;return this.callback=a.throttle(c,b),this},subscribe:function(a){return this.callback=a,this}};var m={cache:{},compare:function(a,b){if(this.cache[b]&&this.cache[b][a])return!0;var c=new RegExp("^"+a.replace(/\./g,"\\.").replace(/\*/g,".*").replace(/#/g,"[A-Z,a-z,0-9]*")+"$"),d=c.test(b);return d&&(this.cache[b]||(this.cache[b]={}),this.cache[b][a]=!0),d}},n={subscriptions:{},wireTaps:new Array(0),publish:function(b){a.each(this.wireTaps,function(a){a(b.data,b)}),a.each(this.subscriptions[b.channel],function(c){a.each(c,function(c){p.configuration.resolver.compare(c.topic,b.topic)&&a.all(c.constraints,function(a){return a(b.data)})&&typeof c.callback=="function"&&(c.callback.apply(c.context,[b.data,b]),c.onHandled())})})},subscribe:function(a){var b,c,d,e=this.subscriptions[a.channel],f;e||(e=this.subscriptions[a.channel]={}),f=this.subscriptions[a.channel][a.topic],f||(f=this.subscriptions[a.channel][a.topic]=new Array(0)),b=f.length-1;for(;b>=0;b--)if(f[b].priority<=a.priority){f.splice(b+1,0,a),c=!0;break}return c||f.unshift(a),a},unsubscribe:function(a){if(this.subscriptions[a.channel][a.topic]){var b=this.subscriptions[a.channel][a.topic].length,c=0;for(;c<b;c++)if(this.subscriptions[a.channel][a.topic][c]===a){this.subscriptions[a.channel][a.topic].splice(c,1);break}}},addWireTap:function(a){var b=this;return b.wireTaps.push(a),function(){var c=b.wireTaps.indexOf(a);c!==-1&&b.wireTaps.splice(c,1)}}},o={1:function(a){if(!a)throw new Error("publishing from the 'global' postal.publish call requires a valid envelope.");a.channel=a.channel||e,a.timeStamp=new Date,p.configuration.bus.publish(a)},2:function(a,b){p.configuration.bus.publish({channel:e,topic:a,timeStamp:new Date,data:b})},3:function(a,b,c){p.configuration.bus.publish({channel:a,topic:b,timeStamp:new Date,data:c})}};n.subscriptions[h]={};var p={configuration:{bus:n,resolver:m},channel:function(){var a=arguments.length,b=arguments[0],c=arguments[1];return a===1&&(Object.prototype.toString.call(b)==="[object String]"?(b=e,c=arguments[0]):(b=arguments[0].channel||e,c=arguments[0].topic)),new k(b,c)},subscribe:function(a){var b=a.callback,c=a.topic,d=a.channel||e;return new l(d,c,b)},publish:function(){var a=arguments.length;o[a]&&o[a].apply(this,arguments)},addWireTap:function(a){return this.configuration.bus.addWireTap(a)},linkChannels:function(b,c){var d=[];return a.isArray(b)||(b=[b]),a.isArray(c)||(c=[c]),a.each(b,function(b){var f=b.topic||"*";a.each(c,function(c){var f=c.channel||e;d.push(p.subscribe({channel:b.channel||e,topic:b.topic||"*",callback:function(b,d){var e=d;e.topic=a.isFunction(c.topic)?c.topic(d.topic):c.topic||d.topic,e.channel=f,e.data=b,p.publish(e)}}))})}),d},reset:function(){p.configuration.bus.subscriptions&&(p.configuration.bus.subscriptions={}),p.configuration.resolver.cache&&(p.configuration.resolver.cache={})}};return b.postal=p,p})
\ No newline at end of file
diff --git a/lib/node/postal.diagnostics.js b/lib/node/postal.diagnostics.js
index a2fe1fd..4f035c4 100644
--- a/lib/node/postal.diagnostics.js
+++ b/lib/node/postal.diagnostics.js
@@ -1,6 +1,7 @@
 module.exports = function(postal) {
+	
 	// this returns a callback that, if invoked, removes the wireTap
-	return postal.addWireTap(function(data, envelope) {
+	postal.diagnostics = postal.addWireTap(function(data, envelope) {
 		var all = _.extend(envelope, { data: data });
 		if(!JSON) {
 			throw "This browser or environment does not provide JSON support";
@@ -18,4 +19,5 @@ module.exports = function(postal) {
 			}
 		}
 	});
+
 };
\ No newline at end of file
diff --git a/lib/standard/postal.diagnostics.js b/lib/standard/postal.diagnostics.js
new file mode 100644
index 0000000..250d5bc
--- /dev/null
+++ b/lib/standard/postal.diagnostics.js
@@ -0,0 +1,27 @@
+// This is the standard lib version of postal.diagnostics.js
+// If you need the amd-module style version, go to http://github.com/ifandelse/postal.js
+(function(postal, _, undefined) {
+
+
+	// this returns a callback that, if invoked, removes the wireTap
+	postal.diagnostics = postal.addWireTap(function(data, envelope) {
+		var all = _.extend(envelope, { data: data });
+		if(!JSON) {
+			throw "This browser or environment does not provide JSON support";
+		}
+		try {
+			console.log(JSON.stringify(all));
+		}
+		catch(exception) {
+			try {
+				all.data = "ERROR: " + exception.message;
+				console.log(JSON.stringify(all));
+			}
+			catch(ex) {
+				console.log("Unable to parse data to JSON: " + exception);
+			}
+		}
+	});
+
+
+})( postal, _ );
\ No newline at end of file
diff --git a/lib/standard/postal.diagnostics.min.gz.js b/lib/standard/postal.diagnostics.min.gz.js
new file mode 100644
index 0000000..f3b96f2
Binary files /dev/null and b/lib/standard/postal.diagnostics.min.gz.js differ
diff --git a/lib/standard/postal.diagnostics.min.js b/lib/standard/postal.diagnostics.min.js
new file mode 100644
index 0000000..dfd9e1b
--- /dev/null
+++ b/lib/standard/postal.diagnostics.min.js
@@ -0,0 +1 @@
+(function(a,b,c){a.diagnostics=a.addWireTap(function(a,c){var d=b.extend(c,{data:a});if(!JSON)throw"This browser or environment does not provide JSON support";try{console.log(JSON.stringify(d))}catch(e){try{d.data="ERROR: "+e.message,console.log(JSON.stringify(d))}catch(f){console.log("Unable to parse data to JSON: "+e)}}})})(postal,_)
\ No newline at end of file
diff --git a/lib/browser/postal.js b/lib/standard/postal.js
similarity index 96%
rename from lib/browser/postal.js
rename to lib/standard/postal.js
index 42e37e7..0ab368f 100644
--- a/lib/browser/postal.js
+++ b/lib/standard/postal.js
@@ -5,17 +5,9 @@
 	Version 0.6.0
  */
 
-(function(root, doc, factory) {
-	if (typeof define === "function" && define.amd) {
-		// AMD. Register as an anonymous module.
-		define(["underscore"], function(_) {
-			return factory(_, root, doc);
-		});
-	} else {
-		// Browser globals
-		factory(root._, root, doc);
-	}
-}(this, document, function(_, global, document, undefined) {
+// This is the standard lib version of postal.js
+// If you need the amd-module style version, go to http://github.com/ifandelse/postal.js
+(function(_, global, undefined) {
 
 var DEFAULT_CHANNEL = "/",
 	DEFAULT_PRIORITY = 50,
@@ -415,5 +407,5 @@ var postal = {
 
 
 	global.postal = postal;
-	return postal;
-}));
\ No newline at end of file
+
+})(_, window);
\ No newline at end of file
diff --git a/lib/standard/postal.min.gz.js b/lib/standard/postal.min.gz.js
new file mode 100644
index 0000000..363d7e0
Binary files /dev/null and b/lib/standard/postal.min.gz.js differ
diff --git a/lib/standard/postal.min.js b/lib/standard/postal.min.js
new file mode 100644
index 0000000..6298587
--- /dev/null
+++ b/lib/standard/postal.min.js
@@ -0,0 +1 @@
+(function(a,b,c){var d="/",e=50,f=0,g="postal",h=function(){},i=function(){var b;return function(c){var d=!1;return a.isString(c)?(d=c===b,b=c):(d=a.isEqual(c,b),b=a.clone(c)),!d}},j=function(a,b){this.channel=a||d,this._topic=b||""};j.prototype={subscribe:function(){var a=arguments.length;if(a===1)return new k(this.channel,this._topic,arguments[0]);if(a===2)return new k(this.channel,arguments[0],arguments[1])},publish:function(a){var b={channel:this.channel,topic:this._topic,data:a};a.topic&&a.data&&(b=a,b.channel=b.channel||this.channel),b.timeStamp=new Date,o.configuration.bus.publish(b)},topic:function(a){return a===this._topic?this:new j(this.channel,a)}};var k=function(a,b,c){this.channel=a,this.topic=b,this.callback=c,this.priority=e,this.constraints=new Array(0),this.maxCalls=f,this.onHandled=h,this.context=null,o.configuration.bus.publish({channel:g,topic:"subscription.created",timeStamp:new Date,data:{event:"subscription.created",channel:a,topic:b}}),o.configuration.bus.subscribe(this)};k.prototype={unsubscribe:function(){o.configuration.bus.unsubscribe(this),o.configuration.bus.publish({channel:g,topic:"subscription.removed",timeStamp:new Date,data:{event:"subscription.removed",channel:this.channel,topic:this.topic}})},defer:function(){var a=this.callback;return this.callback=function(b){setTimeout(a,0,b)},this},disposeAfter:function(b){if(a.isNaN(b)||b<=0)throw"The value provided to disposeAfter (maxCalls) must be a number greater than zero.";var c=this.onHandled,d=a.after(b,a.bind(function(){this.unsubscribe(this)},this));return this.onHandled=function(){c.apply(this.context,arguments),d()},this},ignoreDuplicates:function(){return this.withConstraint(new i),this},withConstraint:function(b){if(!a.isFunction(b))throw"Predicate constraint must be a function";return this.constraints.push(b),this},withConstraints:function(b){var c=this;return a.isArray(b)&&a.each(b,function(a){c.withConstraint(a)}),c},withContext:function(a){return this.context=a,this},withDebounce:function(b){if(a.isNaN(b))throw"Milliseconds must be a number";var c=this.callback;return this.callback=a.debounce(c,b),this},withDelay:function(b){if(a.isNaN(b))throw"Milliseconds must be a number";var c=this.callback;return this.callback=function(a){setTimeout(function(){c(a)},b)},this},withPriority:function(b){if(a.isNaN(b))throw"Priority must be a number";return this.priority=b,this},withThrottle:function(b){if(a.isNaN(b))throw"Milliseconds must be a number";var c=this.callback;return this.callback=a.throttle(c,b),this},subscribe:function(a){return this.callback=a,this}};var l={cache:{},compare:function(a,b){if(this.cache[b]&&this.cache[b][a])return!0;var c=new RegExp("^"+a.replace(/\./g,"\\.").replace(/\*/g,".*").replace(/#/g,"[A-Z,a-z,0-9]*")+"$"),d=c.test(b);return d&&(this.cache[b]||(this.cache[b]={}),this.cache[b][a]=!0),d}},m={subscriptions:{},wireTaps:new Array(0),publish:function(b){a.each(this.wireTaps,function(a){a(b.data,b)}),a.each(this.subscriptions[b.channel],function(c){a.each(c,function(c){o.configuration.resolver.compare(c.topic,b.topic)&&a.all(c.constraints,function(a){return a(b.data)})&&typeof c.callback=="function"&&(c.callback.apply(c.context,[b.data,b]),c.onHandled())})})},subscribe:function(a){var b,c,d,e=this.subscriptions[a.channel],f;e||(e=this.subscriptions[a.channel]={}),f=this.subscriptions[a.channel][a.topic],f||(f=this.subscriptions[a.channel][a.topic]=new Array(0)),b=f.length-1;for(;b>=0;b--)if(f[b].priority<=a.priority){f.splice(b+1,0,a),c=!0;break}return c||f.unshift(a),a},unsubscribe:function(a){if(this.subscriptions[a.channel][a.topic]){var b=this.subscriptions[a.channel][a.topic].length,c=0;for(;c<b;c++)if(this.subscriptions[a.channel][a.topic][c]===a){this.subscriptions[a.channel][a.topic].splice(c,1);break}}},addWireTap:function(a){var b=this;return b.wireTaps.push(a),function(){var c=b.wireTaps.indexOf(a);c!==-1&&b.wireTaps.splice(c,1)}}},n={1:function(a){if(!a)throw new Error("publishing from the 'global' postal.publish call requires a valid envelope.");a.channel=a.channel||d,a.timeStamp=new Date,o.configuration.bus.publish(a)},2:function(a,b){o.configuration.bus.publish({channel:d,topic:a,timeStamp:new Date,data:b})},3:function(a,b,c){o.configuration.bus.publish({channel:a,topic:b,timeStamp:new Date,data:c})}};m.subscriptions[g]={};var o={configuration:{bus:m,resolver:l},channel:function(){var a=arguments.length,b=arguments[0],c=arguments[1];return a===1&&(Object.prototype.toString.call(b)==="[object String]"?(b=d,c=arguments[0]):(b=arguments[0].channel||d,c=arguments[0].topic)),new j(b,c)},subscribe:function(a){var b=a.callback,c=a.topic,e=a.channel||d;return new k(e,c,b)},publish:function(){var a=arguments.length;n[a]&&n[a].apply(this,arguments)},addWireTap:function(a){return this.configuration.bus.addWireTap(a)},linkChannels:function(b,c){var e=[];return a.isArray(b)||(b=[b]),a.isArray(c)||(c=[c]),a.each(b,function(b){var f=b.topic||"*";a.each(c,function(c){var f=c.channel||d;e.push(o.subscribe({channel:b.channel||d,topic:b.topic||"*",callback:function(b,d){var e=d;e.topic=a.isFunction(c.topic)?c.topic(d.topic):c.topic||d.topic,e.channel=f,e.data=b,o.publish(e)}}))})}),e},reset:function(){o.configuration.bus.subscriptions&&(o.configuration.bus.subscriptions={}),o.configuration.resolver.cache&&(o.configuration.resolver.cache={})}};b.postal=o})(_,window)
\ No newline at end of file
diff --git a/src/diags/postal.diagnostics.amd.js b/src/diags/postal.diagnostics.amd.js
new file mode 100644
index 0000000..e7fc4f9
--- /dev/null
+++ b/src/diags/postal.diagnostics.amd.js
@@ -0,0 +1,7 @@
+// This is the amd module version of postal.diagnostics.js
+// If you need the standard lib version, go to http://github.com/ifandelse/postal.js
+define(["postal", "underscore"], function(postal, _, undefined) {
+
+//import("postal.diagnostics.js");
+
+});
\ No newline at end of file
diff --git a/src/diags/postal.diagnostics.js b/src/diags/postal.diagnostics.js
index 5defd32..c044354 100644
--- a/src/diags/postal.diagnostics.js
+++ b/src/diags/postal.diagnostics.js
@@ -1,17 +1,6 @@
-(function(root, doc, factory) {
-	if (typeof define === "function" && define.amd) {
-		// AMD. Register as an anonymous module.
-		define(["postal", "underscore"], function(postal, _) {
-			return factory(postal, _, root, doc);
-		});
-	} else {
-		// Browser globals
-		factory(root.postal, root._, root, doc);
-	}
-}(this, document, function(postal, _, global, document, undefined) {
 
 	// this returns a callback that, if invoked, removes the wireTap
-	return postal.addWireTap(function(data, envelope) {
+	postal.diagnostics = postal.addWireTap(function(data, envelope) {
 		var all = _.extend(envelope, { data: data });
 		if(!JSON) {
 			throw "This browser or environment does not provide JSON support";
@@ -29,5 +18,3 @@
 			}
 		}
 	});
-
-}));
\ No newline at end of file
diff --git a/src/diags/postal.diagnostics.node.js b/src/diags/postal.diagnostics.node.js
index a2fe1fd..a30f023 100644
--- a/src/diags/postal.diagnostics.node.js
+++ b/src/diags/postal.diagnostics.node.js
@@ -1,21 +1,3 @@
 module.exports = function(postal) {
-	// this returns a callback that, if invoked, removes the wireTap
-	return postal.addWireTap(function(data, envelope) {
-		var all = _.extend(envelope, { data: data });
-		if(!JSON) {
-			throw "This browser or environment does not provide JSON support";
-		}
-		try {
-			console.log(JSON.stringify(all));
-		}
-		catch(exception) {
-			try {
-				all.data = "ERROR: " + exception.message;
-				console.log(JSON.stringify(all));
-			}
-			catch(ex) {
-				console.log("Unable to parse data to JSON: " + exception);
-			}
-		}
-	});
+	//import("postal.diagnostics.js");
 };
\ No newline at end of file
diff --git a/src/diags/postal.diagnostics.standard.js b/src/diags/postal.diagnostics.standard.js
new file mode 100644
index 0000000..61cf993
--- /dev/null
+++ b/src/diags/postal.diagnostics.standard.js
@@ -0,0 +1,7 @@
+// This is the standard lib version of postal.diagnostics.js
+// If you need the amd-module style version, go to http://github.com/ifandelse/postal.js
+(function(postal, _, undefined) {
+
+//import("postal.diagnostics.js");
+
+})( postal, _ );
\ No newline at end of file
diff --git a/src/main/postal.amd.js b/src/main/postal.amd.js
new file mode 100644
index 0000000..329d7f1
--- /dev/null
+++ b/src/main/postal.amd.js
@@ -0,0 +1,15 @@
+//import("VersionHeader.js");
+// This is the amd-module version of postal.js
+// If you need the standard lib style version, go to http://github.com/ifandelse/postal.js
+define(["underscore"], function(_, undefined) {
+
+//import("Constants.js");
+//import("DistinctPredicate.js");
+//import("ChannelDefinition.js");
+//import("SubscriptionDefinition.js");
+//import("BindingsResolver.js");
+//import("LocalBus.js");
+//import("Api.js");
+
+	return postal;
+});
\ No newline at end of file
diff --git a/src/main/postal.js b/src/main/postal.js
deleted file mode 100644
index 33f4284..0000000
--- a/src/main/postal.js
+++ /dev/null
@@ -1,24 +0,0 @@
-//import("VersionHeader.js");
-(function(root, doc, factory) {
-	if (typeof define === "function" && define.amd) {
-		// AMD. Register as an anonymous module.
-		define(["underscore"], function(_) {
-			return factory(_, root, doc);
-		});
-	} else {
-		// Browser globals
-		factory(root._, root, doc);
-	}
-}(this, document, function(_, global, document, undefined) {
-
-//import("Constants.js");
-//import("DistinctPredicate.js");
-//import("ChannelDefinition.js");
-//import("SubscriptionDefinition.js");
-//import("BindingsResolver.js");
-//import("LocalBus.js");
-//import("Api.js");
-
-	global.postal = postal;
-	return postal;
-}));
\ No newline at end of file
diff --git a/src/main/postal.standard.js b/src/main/postal.standard.js
new file mode 100644
index 0000000..5775843
--- /dev/null
+++ b/src/main/postal.standard.js
@@ -0,0 +1,16 @@
+//import("VersionHeader.js");
+// This is the standard lib version of postal.js
+// If you need the amd-module style version, go to http://github.com/ifandelse/postal.js
+(function(_, global, undefined) {
+
+//import("Constants.js");
+//import("DistinctPredicate.js");
+//import("ChannelDefinition.js");
+//import("SubscriptionDefinition.js");
+//import("BindingsResolver.js");
+//import("LocalBus.js");
+//import("Api.js");
+
+	global.postal = postal;
+
+})(_, window);
\ No newline at end of file