Simplify database example yml
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Fix proposal specs
Change interface of votes_attributes
Merge pull request #232 from tispratik/Jun29_fix_proposals

Jun29 fix proposals