Merge pull request #3 from JoshuaNotowitz/master

Gems for testing
Merge pull request #4 from ikitha/master

Added Figaro for env variables
Set up env variables with figaro
Merge branch 'master' of https://github.com/kourosh/tally

Conflicts:
	Gemfile.lock
Set up authentication for API: change routes, add token authentication to models and controllers
Modify routes, controllers, views to take authentication into account
Delete politician controller, model, scaffold
Fix Josh's syntax error
Set up testing environment, first test passing
Install rack-cors gem, enable various methods
Set up Pol Controller testing
Fixed merge conflicts in events controller
Modify controllers to bring in data from Event
Fix pol controller
Test for pol events passing
updated user model to prep for geocoding
Merge pull request #5 from ikitha/master

Testing and User model updates
Backbone homepage
gemfile.lock conflict resolution