Migrate to hapi 8.0.0
Merge branch 'master' of github.com:alfredduffyer/Imjur-Server

Conflicts:
	app.js
	controllers/image.js
	models/image.js
	package.json