Deployify

Merge upstream and re-order tasks to restart apache.