Merge 0.6.2/waqas with 0.6.2/MattJ

diff --cc prosody
index 4b016e504e3d9c60c60670704027c2ba8f6f974e,7f4a2cec58a38e70df493abdbdd44b8cdfb27df0..b13369a94cdeafb5994fb9ee357f2d92fcac6944
--- 1/prosody
--- 2/prosody
+++ b/prosody
@@@ -22,7 -21,9 +22,10 @@@ if CFG_SOURCEDIR the
        package.cpath = CFG_SOURCEDIR.."/?.so;"..package.cpath;
  end
  
+ package.path = package.path..";"..(CFG_SOURCEDIR or ".").."/fallbacks/?.lua";
+ package.cpath = package.cpath..";"..(CFG_SOURCEDIR or ".").."/fallbacks/?.so";
+ 
 +-- Substitute ~ with path to home directory in data path
  if CFG_DATADIR then
        if os.getenv("HOME") then
                CFG_DATADIR = CFG_DATADIR:gsub("^~", os.getenv("HOME"));