Yes. If you are currently running the developer preview, you will be able to update to the official 8.1 when it's released for your handset/region/carrier. You don't have to do anything special to make this happen.
Correct. People with WP8.1 preview will get the official update at the same time as everyone else (and will get manufacturer firmware (Cyan for Nokia owners) at the same time).