Some cleanup and now using the P&T doc styles
Merge branch 'dev' of github.com:pixelandtonic/Craft-Docs into dev

Conflicts:
	source/diving-in/users.rst