Add Disqus commenting and modify wording on accept appr. conf. link
Merge branch 'master' of https://github.com/ddgriffin/GG-mvp

Conflicts:
	app/views/apprenticeships/_xedit.html.haml