HerokuVendorFix
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of /Users/kimardenmiller/Dropbox/Spokenvote/Git/spokenvote with conflicts.
Remove Heroku Gem