kinda added a cog for editing pivotal settings.  Still needs stlying.
Merge remote-tracking branch 'origin/master'