added spec for proposal improvement task
merged in bills latest changes
Merge remote-tracking branch 'upstream/master'
added testcase for branching
merged with upstream
Merge remote-tracking branch 'upstream/master'
uncommented tests in vote model spec
Add Staging Environment Faker Gem
Removed  Faker Gem
Merge remote-tracking branch 'origin/master'
Merge pull request #129 from functioncallback/master

Kickoff migration to backbone
Merge remote-tracking branch 'origin/master'
Airbreak Support with API Key

Airbreak using the AIRBRAKE_API_KEY
Add Staging Environment Faker Gem
Removed  Faker Gem
Airbreak Support with API Key

Airbreak using the AIRBRAKE_API_KEY
Fixed Airbreak ENV['AIRBRAKE_API_KEY']
Merge remote-tracking branch 'kimmiller/airbreak-support-wAPI-key' into airbreak-support

Conflicts:
	config/initializers/airbrake.rb
Merge pull request #132 from kimardenmiller/airbreak-support-wAPI-key

Airbreak support w api key
Logging in now sets a cookie with the email specified by the user whenever the 'remember me' checkbox is checked. And when that cookie is set, the login form has the email address filled in using the value in the cookie.