update my fork

I need a base that I can create branches from, other wise my branch gets messy