Update to ruby 2.0 and remove foundation framework
Merge remote-tracking branch 'origin/master'

Conflicts:
	.rvmrc
	Gemfile.lock