automatically updated dependencies
Merge branch 'refs/heads/master' into update-dependencies-2014-01-01

Conflicts:
	Gemfile.lock
Merge pull request #47 from theodi/update-dependencies-2014-01-01

automatically updated dependencies