Alt and title attributes for images
Remove conflict markers
Remove scss related to a different option
Simplify title and alt methods
Merge pull request #2657 from anitagraham/AltTagsForImages

Alt tags for images
Update heroku db:push to pg:push

heroku db:push & db:pull was deprecated for pg:push and pg:pull
Merge remote-tracking branch 'refinery/master'
Merge branch 'master' into page-plugin-strong-params