Merge pull request #153 from RyanTG/master

fixed style updates, plus others - can you push to live today (so I can take a look on my windows box tomorrow)?
Merge pull request #155 from RyanTG/master

location link moved below location pictures.
upgrade paperclip to fix this bug: https://github.com/thoughtbot/paperclip/issues/1164
Merge branch 'enhancements'
Merge pull request #158 from RyanTG/master

grand rapids thumbnail update
require http:// in front of website entries for locations
Merge branch 'enhancements'
properly test new website validation logic
Merge branch 'enhancements'
updated ocean city assets