create vote_features_spec, pass single integration test, update votes_controller
resolve merge conflicts