Updated Confidence, and -std=c++0x
merge
Changed gitignore to add swap files