Updated to use maven 3 and updated/added some dependencies