Merge pull request #31 from spring-peepers-2014/org_vertical

Complete organization controller tests and implementation
fix org controller tests by adding pass and pass conf in strong params
Merge branch 'development' into org_vertical