Updated to express 3.0 and reorganized the server.js a bit.
Merge pull request #8 from eliperkins/develop

Updated to express 3.0 and reorganized the server.js a bit.