Merge branch 'release-0.5'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Add a bunch of stuff to make it better
adding winner algorithms
Merge branch 'develop' of git.assembla.com:cis422w13_team3 into develop
Add membervote option serializer/view
Start supporting vote results
Bunch of updates
Check for presence of email
Fix initial form kwargs
Use correct namespace for DoesNotExist
Update api for RuiQi to test
parse json manually
Commit just so that RuiQi can access the API
adding algorithms for plurality, borda
Merge Jonathan's code for vote types
fixing plurality method
Fixes the clown