vote controller and features test
Merge branch 'master' of github.com:purple-martins-2013/seth-steve-mark-dan-inkreactor
Merge branch 'master' into post_tags
migration post-merge
integrate tags into post views
Merge commit 'ef5ad78' into post_tags