update org controller
Merge branch 'development' into org_vertical
replace pending with skip
Merge pull request #37 from spring-peepers-2014/org_vertical

Replace pending (deprecated) with skip in testing