removed artisan.
assembla support
Merge remote-tracking branch 'rt/master'
Merge remote-tracking branch 'rt/master'
Tweak marketplace.
Marketplace cleanup.
Merge remote-tracking branch 'rt/master'

Conflicts:
	Gemfile.lock
Fix market place yml file load