Local update
Merge branch 'master' into zunda-local
Revert "Local update"

This reverts commit 8197c9ec6887a7f6012a496db49ea8be022ba94e.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Gemfile.lock
Follow upstream
Fix word to be used for testing translation

'cloudy' -> 'broken clouds'
Add a translation

`overcast cloud deck' translates to `Kumori'
dependency update
Merge remote-tracking branch 'origin/master'
remove typepad antispam service from spam filter. [fix GH-421]
upgrade rspec-3 rc1
fix broken spec
Merge pull request #419 from zunda/fix-weater-test

Fix word to be used for testing translation
Merge pull request #420 from zunda/add-weather-translation

Add weather translation
Merge pull request #422 from tdiary/ready-to-rspec3

rspec 3.0.0.rc1 へのアップグレード
Merge remote-tracking branch 'upstream/master'