Add error checking and cleanup code

- Cleanup code
- Wrap long lines
- Add more error checking
- Remove command line option to specify location of site.  Now it only
  uses the current directory.  This saves having to do a bunch of
  path testing.