Tweaking the likes statement a bit
Updated dependencies
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile.lock
Merged
Not sure why the gemfile reverted...
More gemfile updates
Last gem updates and some minor tweaks
Set the twitter defaults so that we don't have to add them everywhere