Acts as paranoid

* Cleaned up merge with `tansaku:develop`
* stubbed some methods in `organizations_controller_spec.rb` to allow for new method associated with delete functionality