So, we finally came up with an idea that worked. We have a linen closet in our master bathroom. This was always the temporary litter spot when we had company stay over and they used the spare room. The cats didn't seem to mind it being there and we never had a problem with them using it. The only issue was going to be the smell. We use that bathroom all the time and we didn't want to have to smell the litter (or what was in the litter) in our bathroom. So here is the solution:

We decided to put a cat/dog door in the door of our linen closet. This way we can keep the door closed and not have to worry about the smell and the litter getting all over the floor. We went to Lowes and bought a cheap door (hence the cream color) and cat/dog door. We didn't want to use the door that was currently there for resale purposes. It took us a few days to get the cats acclimated to the new location and the new door, but they seem to be doing fine. Today was the first day we had both litter boxes in there and kept the door shut. No accidents so far! Let's hope it stays that way!!!
With that project accomplished, we can now focus on cleaning out the rest of the spare room and getting it ready for baby. We still have to wait until we find out the gender before we can do any decorating, but until then it will be clean and ready to go!