Omniscientgeek
Just another WordPress site
Use git merge from master branch using no fast forward option.