Merge branch 'master' of https://github.com/cicadas-2014/Embark

Conflicts:
	Gemfile.lock