fixed merge conflicts from last merge and some style
fixed event view
added back terms of use and about us pages
fixed readme
Merge pull request #29 from smspezzano/fixes

fixes 4/1/14