Merge branch 'master' of git@github.com:wycats/merb-core

* 'master' of git@github.com:wycats/merb-core: (50 commits)
  add Merb::Rack::Profiler middleware. to use add the following to your 
  config/rack.rb file:
  update license
  Missing require
  require 'stringio'
  Add support for non-standard template reloading. Plugin authors need to 
  override load_template_io to handle special reloading logic.
  Add support for IO templates instead of just paths. See PLUGIN_API_CHANGELOG 
  for details.
  add swiftiplied mongrel rack adapter.
  Swapped the order of helper and controller in the default_framework
  Why should capture be private?
  Merb::Config[:framework] now needs absolute paths to work (breaks BC)
  Merb::Config[:framework] paths now pickup files using glob **/*.rb unless 
  specified otherwise
  Don't automatically use Facebook signature
  Fixes failing spec.
  make the default rake task 'specs' so running rake in merb-core just runs the 
  specs
  Rename @status to @_status
  Avoid adding nil values in place of missing keys for Hash#only
  Fix issue with null segments
  Fixed session cookie expires value [#366 state:resolved]
  Made HTTP method override proc-based and pluggable. [#364]
  siiiiiigh.
  ...