Update battery plugin to show calculating - OSX

Instantly after removing the charger, I have found that the "AvgTimeToEmpty" value can swing to rediculous values. Apple's current claim is that the max battery life is 12 hours, so any value larger than this is considered a "time is being calculated" value.
Remove mailcatcher from the bundler plugin.

Recommended by @sj26 per https://github.com/sj26/mailcatcher#bundler.
added the linux implementation to the battery plugin
ssh-agent: prevent environment file from flapping

On an OS X laptop, the variable `$HOST` changes a lot depending
on what wifi network you're connected to.  This causes a lot
of `~/.ssh/environment-$HOST` files to be created and
causes multiple ssh-agents to created.

Instead, use `scutil --get ComputerName` to get something
more stable.
add option to show dirty status of current dir
Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh into dev
Ignore more users in ssh completion.

Signed-off-by: Mariusz Fik <fisiu@opensuse.org>
Merge pull request #2613 from Fisiu/ignore-ssh-users

Ignore more users in ssh completion.
Merge pull request #2607 from avonderluft/dev

Show svn dirty on current dir, as well as whole working copy
Merge pull request #2603 from docwhat/ssh-agent-hostname

ssh-agent: prevent environment file from flapping
Merge pull request #2574 from thiagowfx/linux-battery

added the linux implementation to the battery plugin
Merge pull request #2549 from brandon-beacher/master

Remove mailcatcher from the bundler plugin.
Merge pull request #2539 from chriswiggins/master

Update battery plugin to show calculating - OSX
Merge remote-tracking branch 'upstream/master'