Merge remote-tracking branch 'upstream/master' into toast

After the Cory-Aditi Merge Conflict of 2014
Merge pull request #11 from kyleofori/toast

Dialog box is in theme!
Merge remote-tracking branch 'upstream/master'

Now that the icons are updated for the dialog box...
down in a hole, losing my soul
Merge pull request #12 from ajbtee/master

down in a hole, losing my soul
Merge remote-tracking branch 'upstream/master'

Just did another one.