Deanos, thanks for the link.
It's hard to tell exactly what kind it is, but all indication points to the orange spotted diamond goby. From this marinedepot site, it looks similar and they say it's known to share it's burrow with the pistol shrimp. See this:
http://www.marinedepotlive.com/orang...h--gobies.html
The top fins resemble those of most of the symbiotic shrimps. I can always give it a shot, but either way they are cool to watch sift sand and just hang out together. I'll do some more research on it.