Fix newline issues

Swap out nl2br method for Nokogiri::HTML method to avoid extraneous <br> elements
Merge branch 'sinatra' of github.com:scholarslab/geoportal into sinatra