added fields to account model, added edit to accounts, moved before filter to app controller, updated nav to include users/settings