more cleanup
Merge branch 'master' of github.com:alfiehanssen/ios-viewcontroller-containment