Initial commit

I'm going to merge in your include changes. I am not going to pull the eclipse changes as I can't see what the diffs are (the xml diff doesn't seem to work well)