diff --git a/bower.json b/bower.json
index 0b4aa50..742d1fd 100644
--- a/bower.json
+++ b/bower.json
@@ -1,7 +1,7 @@
 {
 	"name": "rvc",
 	"description": "RequireJS plugin to load and optimise Ractive components",
-	"version": "0.1.8",
+	"version": "0.1.9",
 	"author": "Rich Harris",
 	"license": "MIT",
 	"main": ["rvc.js"],
diff --git a/package.json b/package.json
index 1c46f1c..d92b9ed 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rvc",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "RequireJS plugin to load and optimise Ractive components",
   "main": "rvc.js",
   "repository": {
diff --git a/rvc.js b/rvc.js
index 97eccd5..6fd4c72 100644
--- a/rvc.js
+++ b/rvc.js
@@ -1,6 +1,6 @@
 /*
 
-	rvc.js - v0.1.7 - 2014-06-02
+	rvc.js - v0.1.9 - 2014-07-09
 	==========================================================
 
 	https://github.com/ractivejs/rvc
@@ -8,9 +8,7 @@
 
 */
 
-define( [ 'ractive'
-	'module'
-], function( Ractive, module ) {
+define( [ 'ractive' ], function( Ractive ) {
 
 	'use strict';
 
@@ -205,14 +203,14 @@ define( [ 'ractive'
 
 	/*
 
-	rcu (Ractive component utils) - 0.1.5 - 2014-06-02
+	rcu (Ractive component utils) - 0.1.8 - 2014-06-02
 	==============================================================
 
 	Copyright 2014 Rich Harris and contributors
 	Released under the MIT license.
 
 */
-	var rcuamd = function() {
+	var rcu = function() {
 
 		var Ractive;
 		var getName = function getName( path ) {
@@ -255,6 +253,15 @@ define( [ 'ractive'
 						}
 					}
 				}
+				// Clean up template - trim whitespace left over from the removal
+				// of <link>, <style> and <script> tags from start...
+				while ( /^\s*$/.test( template[ 0 ] ) ) {
+					template.shift();
+				}
+				// ...and end
+				while ( /^\s*$/.test( template[ template.length - 1 ] ) ) {
+					template.pop();
+				}
 				// Extract names from links
 				imports = links.map( function( link ) {
 					var href, name;
@@ -363,13 +370,12 @@ define( [ 'ractive'
 		}();
 		var make = function( parse, eval2 ) {
 			return function make( source, config, callback, errback ) {
-				var definition, url, createComponent, loadImport, imports, loadModule, modules, remainingDependencies, onloaded, onerror, ready;
+				var definition, url, createComponent, loadImport, imports, loadModule, modules, remainingDependencies, onloaded, ready;
 				config = config || {};
 				// Implementation-specific config
 				url = config.url || '';
 				loadImport = config.loadImport;
 				loadModule = config.loadModule;
-				onerror = config.onerror;
 				definition = parse( source );
 				createComponent = function() {
 					var options, Component, script, factory, component, exports, prop;
@@ -451,8 +457,9 @@ define( [ 'ractive'
 		}( parse, eval2 );
 		var resolve = function resolvePath( relativePath, base ) {
 			var pathParts, relativePathParts, part;
-			if ( relativePath.charAt( 0 ) !== '.' ) {
-				// not a relative path!
+			// If we've got an absolute path, or base is '', return
+			// relativePath
+			if ( !base || relativePath.charAt( 0 ) === '/' ) {
 				return relativePath;
 			}
 			// 'foo/bar/baz.html' -> ['foo', 'bar', 'baz.html']
@@ -501,7 +508,7 @@ define( [ 'ractive'
 				}
 			}, callback, errback );
 		};
-	}( rcuamd );
+	}( rcu );
 
 	/* toSource by Marcello Bastea-Forte - zlib license */
 	/* altered to export as AMD module */
@@ -591,7 +598,7 @@ define( [ 'ractive'
 			builtModule += 'return Ractive.extend(__options__);\n});';
 			callback( builtModule );
 		};
-	}( rcuamd, tosource, minifycss );
+	}( rcu, tosource, minifycss );
 
 	var rvc = function( amdLoader, rcu, load, build ) {
 
@@ -603,7 +610,7 @@ define( [ 'ractive'
 				load( name, req, source, callback, errback );
 			}
 		} );
-	}( loader, rcuamd, load, build );
+	}( loader, rcu, load, build );
 
 	return rvc;