testing nginx config.
Undoing nginx nonsense.
testing nginx config.
Undoing nginx nonsense.
Merge branch 'master' of psteadman.com:docgoose
Merge branch 'master' of 54.213.43.63:docgoose