Basic setup for the vote class.  Need to test it to make sure it sends properly
Application configurations referenceing external api we're posting to.
I WILL ADD THE .PROJECT FILE AND .gitignore WILL NOT STOP ME!
Merge remote-tracking branch 'upstream/dev'
In progress
Fixed the problem with subscriptions. String comparisons were set up incorrectly.
Merge pull request #51 from ShadowSam/master

Fixed subscriptions
Functionality for voting (minus the sending of the vote to the PM system) is now completely working
js for keyword search
Merge pull request #52 from ShadowSam/master

Functionality for voting (minus the sending of the vote to the PM system...
Added watching
Adding js for keyword search
Merge pull request #53 from ShadowSam/master

Added watching
POC for keyword search
Extracting regex query logic to DB class
Adding more info to the catalog page
Seeing if I can automagically post JSON via Jackson
Merge branch 'rest_posts' of https://github.com/Venture-TheSphinxTeam/Sphinx into rest_posts

Conflicts:
	app/models/Vote.java
Mkay
Extracted JSON sending and set up templated targets