added spec for proposal improvement task
merged in bills latest changes
Merge remote-tracking branch 'upstream/master'
added testcase for branching
merged with upstream
Merge remote-tracking branch 'upstream/master'
uncommented tests in vote model spec
merged latest master into local repo
Fixed vote spec
Merge pull request #155 from philipppahl/master

Addes specs for votes