Unsubscribe from app. ref 14873
Minor fix
Spec comment fix
Merge branch 'errbit' into feature/upstream_merge
Merge upstream
Remove return(false) from before_filter "require_watcher_edit_priviledges"
Merge branch 'errbit' into feature/upstream_merge
added support Unfuddle
icon for unfuddle
Added development group to Gemfile
Update to Rails 3.2.13
Merge pull request #439 from rdlugosz/upgrade_to_rails_3-2-13

Update to Rails 3.2.13
Fixed mailer specs
Use tilt from master branch until 1.3.7 is released, to fix 1.8.7 asset compiling
Fixed tilt github url
Notice API: properly transform <var> tags

<var> tags with blank values were ending up completely wrong in the
resulting hash.

This: (a user with a blank name)
    <var key="user">
       <var key="id">123</var>
       <var key="name"/>
    </var>

Gets parsed by hoptoad_notifier into this:
    {
       'key' => 'user',
       'var' => [{
             'key' => 'id',
             '__content__' => '123'
          },{
             'key' => 'name'
          }]
    }

Which when passed through the "rekey" method, ended up like this:
    {
       'user' => {
          'id' => '123',
          'key' => 'name' # bad and wrong
       }
    }

Now, after these changes, it correctly comes through as:
    {
       'user' => {
          'id' => '123',
          'name' => nil # much better!
       }
    }
Merge pull request #442 from iFixit/notice-xml-parsing-fix-blank

Notice API: properly transform <var> tags
Capistrano: deploy from fixed branch

Not the 'current' branch in the local clone fo the repo.

I feel like deploying from the current branch in the local clone is a
bit presumptous. I expect most people want to deploy from one branch
while allowing for development of several feature branches.

Right now you always have to remember to check out master before
deploying or you may deploy your feature branch (which may not even be
pushed).
Merge pull request #443 from iFixit/deploy-fixed-branch

Capistrano: deploy from fixed branch
Update the Airbrake domain in the README