I'm specifically NOT using their list. I've checked it out and a lot of stuff on there is not referenced, nor can I recall seeing it anywhere other than the wiki. I want to compile this list completely from what we see in the trailers, demos, interviews etc... as well as comments made by JES here.
If you watch the video, that's from E3, it has some weapons that weren't specifically shown. Like when he goes to switch out weapons, pause it and you'll see that that's where the Vault Wiki got most of it's weapons, and from other videos showing various weapons in the weapons section of the Pip-boy.