settings page stuff
i don't know what's happening, this is another commit and finished settings stuff
random stuff
this editor really wants it
Merge remote-tracking branch 'origin/bala' into eric