Merge branch 'asset_path_version_public_folder' of https://github.com…

…/grundprinzip/showoff into grundprinzip-asset_path_version_public_folder

Conflicts:
	lib/showoff.rb

bin/showoff

@@ -2,12 +2,13 @@
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'showoff'
+require 'showoff/version' 
 require 'rubygems'
 require 'gli'
 
 include GLI
 
-version ShowOff::Version 
+version SHOWOFF_VERSION
 
 desc 'Create new showoff presentation'
 arg_name 'dir_name'

lib/showoff.rb

@@ -55,6 +55,9 @@ def initialize(app=nil)
     @logger.debug settings.pres_dir
     @pres_name = settings.pres_dir.split('/').pop
     require_ruby_files
+
+    # Default asset path
+    @asset_path = "./"
   end
 
   def self.pres_dir_current

lib/showoff_utils.rb

@@ -293,6 +293,8 @@ def self.get_config_option(dir, option, default = nil)
           data[option] || default
         end
       end
+    else
+      default
     end
   end