Ethernet on 1.0.4?

Well Now I am really confused. Not sure what went wrong with the Ethernet code I was using before. I would compile it and even upload it to the Uno and everything was fine. (All but the Shield with the incorrect chip). The new Shield came in, and I have been trying to upload the code to give it a test, although I keep getting the following errors.

This is the Code I am using:

#include <SPI.h>
#include <Ethernet.h>

// Enter a MAC address and IP address for your controller below.
// The IP address will be dependent on your local network:
byte mac[] = { 
  0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED };
IPAddress ip(192,168,1, 177);

// Initialize the Ethernet server library
// with the IP address and port you want to use 
// (port 80 is default for HTTP):
EthernetServer server(80);

void setup() {
 // Open serial communications and wait for port to open:
  Serial.begin(9600);
   while (!Serial) {
    ; // wait for serial port to connect. Needed for Leonardo only
  }


  // start the Ethernet connection and the server:
  Ethernet.begin(mac, ip);
  server.begin();
  Serial.print("server is at ");
  Serial.println(Ethernet.localIP());
}


void loop() {
  // listen for incoming clients
  EthernetClient client = server.available();
  if (client) {
    Serial.println("new client");
    // an http request ends with a blank line
    boolean currentLineIsBlank = true;
    while (client.connected()) {
      if (client.available()) {
        char c = client.read();
        Serial.write(c);
        // if you've gotten to the end of the line (received a newline
        // character) and the line is blank, the http request has ended,
        // so you can send a reply
        if (c == '\n' && currentLineIsBlank) {
          // send a standard http response header
          client.println("HTTP/1.1 200 OK");
          client.println("Content-Type: text/html");
          client.println("Connection: close");
          client.println();
          client.println("<!DOCTYPE HTML>");
          client.println("<html>");
                    // add a meta refresh tag, so the browser pulls again every 5 seconds:
          client.println("<meta http-equiv=\"refresh\" content=\"5\">");
          // output the value of each analog input pin
          for (int analogChannel = 0; analogChannel < 6; analogChannel++) {
            int sensorReading = analogRead(analogChannel);
            client.print("analog input ");
            client.print(analogChannel);
            client.print(" is ");
            client.print(sensorReading);
            client.println("
");       
          }
          client.println("</html>");
          break;
        }
        if (c == '\n') {
          // you're starting a new line
          currentLineIsBlank = true;
        } 
        else if (c != '\r') {
          // you've gotten a character on the current line
          currentLineIsBlank = false;
        }
      }
    }
    // give the web browser time to receive the data
    delay(1);
    // close the connection:
    client.stop();
    Serial.println("client disonnected");
  }
}

And here are the errors.

In file included from C:\Documents and Settings\Administrator\My Documents\Arduino\libraries\ENC28J60/Ethernet.h:5,
from WebServer.ino:19:
C:\Documents and Settings\Administrator\My Documents\Arduino\libraries\ENC28J60/Client.h:22: error: conflicting return type specified for 'virtual void Client::write(uint8_t)'
C:\Documents and Settings\Administrator\My Documents\Downloads\arduino-1.0.4-windows\arduino-1.0.4\hardware\arduino\cores\arduino/Print.h:48: error: overriding 'virtual size_t Print::write(uint8_t)'
C:\Documents and Settings\Administrator\My Documents\Arduino\libraries\ENC28J60/Client.h:24: error: conflicting return type specified for 'virtual void Client::write(const uint8_t*, size_t)'
C:\Documents and Settings\Administrator\My Documents\Downloads\arduino-1.0.4-windows\arduino-1.0.4\hardware\arduino\cores\arduino/Print.h:53: error: overriding 'virtual size_t Print::write(const uint8_t*, size_t)'
In file included from C:\Documents and Settings\Administrator\My Documents\Arduino\libraries\ENC28J60/Ethernet.h:6,
from WebServer.ino:19:
C:\Documents and Settings\Administrator\My Documents\Arduino\libraries\ENC28J60/Server.h:16: error: conflicting return type specified for 'virtual void Server::write(uint8_t)'
C:\Documents and Settings\Administrator\My Documents\Downloads\arduino-1.0.4-windows\arduino-1.0.4\hardware\arduino\cores\arduino/Print.h:48: error: overriding 'virtual size_t Print::write(uint8_t)'
C:\Documents and Settings\Administrator\My Documents\Arduino\libraries\ENC28J60/Server.h:18: error: conflicting return type specified for 'virtual void Server::write(const uint8_t*, size_t)'
C:\Documents and Settings\Administrator\My Documents\Downloads\arduino-1.0.4-windows\arduino-1.0.4\hardware\arduino\cores\arduino/Print.h:53: error: overriding 'virtual size_t Print::write(const uint8_t*, size_t)'
WebServer:25: error: 'IPAddress' does not name a type
WebServer:30: error: 'EthernetServer' does not name a type
WebServer.ino: In function 'void setup()':
WebServer:41: error: 'ip' was not declared in this scope
WebServer:42: error: 'server' was not declared in this scope
WebServer:44: error: 'class EthernetClass' has no member named 'localIP'
WebServer.ino: In function 'void loop()':
WebServer:50: error: 'EthernetClient' was not declared in this scope
WebServer:50: error: expected `;' before 'client'
WebServer:51: error: 'client' was not declared in this scope

I am thinking that somehow I may have mixed up some of the old library files with the newer current ones? I am not sure, and any help would be appreciated.