Modified travis yml
Fixed merge conflict
Removed open-uri from gemfile, dinner was good
Fixed gemfile...again
Added UTF-8 coding, Travis was complaining
Played with some stuff
Merge branch 'eddwin-develop'