Merge pull request #2 from kgilbert-cmu/master

Updated up through Spring 2014 class
I've always hated this calendar. Removed.
per Seth, removed partial references to calendar everywhere
also found these untracked and unneeded files to add to .gitignore on Windows machines