Delete trailing spaces
Update project to Express 3

Performed some other clean up as well.
Improve formatting
Set up addthis