Add Spork to Guard
Fix conflic of Guardfile with remote version
Fix conflict of Gemfile with remote version