forces to ssl
Merge branch 'staging'
hotfix to rake task
another hot fix
Merge branch 'staging'
Merge branch 'staging'
adding acts_as_paranoid
forgot migration
adds UI for admin to delete - but needs more checks to prevent others seeing button
checks that only admin can see delete button
hacky adding sort to the admin view of users, and adding in last logged in date
cleaning up messy code in view in a helper
Merge pull request #62 from tansaku/acts_as_paranoid_makers

adding acts_as_paranoid
Merge pull request #63 from tansaku/acts_as_paranoid_ui

Acts as paranoid UI
Merge pull request #64 from tansaku/improving_all_users_admin_interface

hacky adding sort to the admin view of users, and adding in last logged in date
Merge branch 'master' of https://github.com/AgileVentures/LocalSupport
change page.should have_selector to find.native.text because the former ignores second argument if the first is not a symbol and title text was never being checked.  change title in feature to match title on page.
upgrade capybara to 2.0.3 and do not require selenium webdriver
upgrading to capybara 2.4.1
change map steps to look for invisible script tag