Added directories and files generated by cabal-debian to .gitignore
Upgraded to dbus 0.10
Removed Proxy data type from Battery.hs
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/System/Information/Battery.hs
	src/System/Taffybar/MPRIS.hs
	src/System/Taffybar/XMonadLog.hs
	taffybar.cabal
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Bugfix: prevent calendar popup from being destoyed.

The window should intercept the delete event and hide itself,
otherwise it's gone forever.
Added missing Haddock comments.
Merge remote-tracking branch 'upstream/master'
Fixed merge error
Added missing Haddock comments
Factored utility functions out of SimpleClock into System.Taffybar.Widgets.Util
New widgets: TaffyPager, WorkspaceSwitcher, LayoutSwitcher, WindowSwitcher and their dependencies.
Removed unnecessary dependency on stm.
Merge remote-tracking branch 'upstream/master'
Revert "Removed unnecessary dependency on stm."

This reverts commit 7542a261958e82e0ebae651d2c107a02b31d48dd.
Added missing signature.
Syntax and style improvements proposed by travitch
Merge branch 'master' of git://github.com/travitch/taffybar

Conflicts:
	src/System/Taffybar/SimpleClock.hs
add hiddenWorkspace decorator to PagerConfig