Did you use BootCamp to delete the partition and reclaim the space on your HD to make it one partition? If not, you should use it to do this.
As for the start up disk, you should be able to go to System Preferences, then select Startup Disk, then select your Mac OS partition.