gem updates
Merge remote-tracking branch 'decko/master'

Conflicts:
	Gemfile.lock
Merge pull request #40 from xithan/master

Gemfile.lock update