Pulled v1.8 into the repo
Brought 2.0 into master where it should be.. still learning git.