hope this fucking works this time
Merge pull request #22 from fox-squirrels-2013/master

I added some attributes to events and I stuck them in the view.  A few other minor things.
Merge pull request #23 from fox-squirrels-2013/new_attributes

hope this fucking works this time