2.0.0.beta2
Update README.md

rpush.yml no longer is generated; update to reflect rpush.rb
Merge pull request #51 from joshmn/patch-1

Update README.md
Adds ActiveRecord::ConnectionTimeoutError to the list of handled exceptions on Reconnectable
Merge pull request #53 from jmnsf/fix_active_record_timeout_resend

Handles DB timeout in reconnectable.rb
Rename Apns::Feedback#app to app_id, change type to Integer. Fixes #50.
Fix integer devision error. Fixes #57, #56.
Add example Upstart job.
Add notification_id_will_retry and notification_id_failed, used by ApnsTcp. Fixes #54.
Bundle update
Remove unused param.
Fix generator for users upgrading from Rapns. Fixes #59.
Mergin from upstream.

Merge branch 'master' of https://github.com/rpush/rpush. This is an
update before doing anything

Conflicts:
	CHANGELOG.md
	Gemfile.lock
	Gemfile.rails-4.lock
	README.md
	lib/generators/rpush_generator.rb
	lib/generators/templates/rpush.rb
	lib/generators/templates/rpush_2_0_0_updates.rb
	lib/rpush/client/active_record/apns/feedback.rb
	lib/rpush/daemon.rb
	lib/rpush/daemon/app_runner.rb
	lib/rpush/daemon/dispatcher/apns_tcp.rb
	lib/rpush/daemon/store/active_record.rb
	lib/rpush/daemon/store/active_record/reconnectable.rb
	lib/rpush/daemon/store/redis.rb
	lib/rpush/daemon/wpns/delivery.rb
	lib/rpush/reflection.rb
	lib/rpush/version.rb
	spec/functional/apns_spec.rb
	spec/unit/daemon/app_runner_spec.rb
	spec/unit/daemon/store/active_record/reconnectable_spec.rb
	spec/unit/daemon/store/active_record_spec.rb