Cleaned up, updated to most recent method for incorporating plugins and such.  Image plugin was not included for now since I don't think it will be needed, but it can always be added if necessary.