Bump version
Add check for existing heroku remote
Merge pull request #76 from juggler/develop

Remove remote heroku before add new one
Revert "Add check for existing heroku remote"

This reverts commit 3a137850f9c12fbe7e3ff3c0f5cefe5c7c932aa3.
Merge branch 'hotfix/remove-git-remote-on-deploy' into develop

* hotfix/remove-git-remote-on-deploy:
  Remove git remote silently on deploy from CI
  Revert "Add check for existing heroku remote"
  Add check for existing heroku remote
  Bump version
Merge branch 'develop' of github.com:fs/rails3-base into develop

* 'develop' of github.com:fs/rails3-base:
  Revert "Add check for existing heroku remote"
  Add check for existing heroku remote
Merge branch 'release/0.3.3' into develop

* release/0.3.3:
  Update changelog
add factory girl to development env
use 1.9 hash syntax in scaffold templates
update rails version to 3.2.12
Merge pull request #82 from Biserov/scaffold_templates

use 1.9 hash syntax in scaffold templates
Merge pull request #80 from Biserov/update_rails

update rails version to 3.2.12
Merge pull request #81 from Biserov/move_factory_girl

add factory girl to development env
Merge branch 'develop' of github.com:fs/rails3-base into develop

* 'develop' of github.com:fs/rails3-base: (38 commits)
  Update changelog
  Update devise to 2.2.3
  Update bullet to 4.3.0
  Update dotenv to 0.5.0.
  Update factory_girl_rails to 4.2.0
  Update foreman to 0.61.0
  Update jquery-rails to 2.2.0
  Update slim to 1.3.6, slim-rails to 1.1.0
  Update debugger to 1.3.0
  Update RBP config
  Save with exceptions
  Update debugger
  Add user@example.com to seed.rb
  Update changelog
  Update rails_best_practices
  Update brakeman
  Remove heroku gem, prefer Heroku toolbelt instead
  Update rails to 3.2.11
  Update change log
  Update minor gems
  ...
Merge branch 'develop'

* develop:
  Revert "Add check for existing heroku remote"
  Add check for existing heroku remote
  Bump version
Update debugger
Use https://rubygems.org in Gemfile
Update changelog
Update airbrake to 3.1.8
Update decent_exposure to 2.1.0