Scaffold controllers and controller specs (make pass); stubbed few items
Merge remote-tracking branch 'origin/master'