Updated changes per Griffel that allow paperclip to function correctly
Merge branch 'master' of https://github.com/michaeldionne/omrails

Conflicts:
	app/models/pin.rb