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

* 'master' of git@github.com:wycats/merb-core: (55 commits)
  Fix bug with :status
  Spec for :status in display
  display handles :status and :location
  Improved RDoc of Merb#load_dependencies.
  script/frozen-merb => merb-freezer in RDoc
  Adjusted logging message for thin sockets vs ports.
  Added socket option to thin.rb and to the command line options.
  send_file opens files in 'rb' binary mode so windows doesn't shit itself
  fix nginx_send_file
  Spec for previously applied patch to Behavior#defer_to.
  use Route#register in defer_to so that deferred routes get an index
  Make Autotest ignore doc/ as well.
  Ensure Autotest ignores changes in log directory.
  Add helpers directory to load path
  Modules don't get duped right.
  Redo Merb's inheritable_accessors so that they have correct semantics, then 
  redo everything that uses inheritable_accessors so they don't have to hack 
  around the bad semantics.
  Added spec for the route matcher testing regexp routes. [#386]
  Add Merb.started? alias for Merb.started reader.
  Add reader for @started flag which shows when Merb environment is started.
  Update memory session storage documentation.
  ...