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
newline formatting in .gitignore and about/_nav.haml
Merge pull request #3 from kgilbert-cmu/nocalendar

Are we keeping the calendar or not?