updating for clarity
updating token syntax for clarity
Merge pull request #27 from Binstar/feature/token-standardization

Feature/token standardization
ENH: added advanced config settigns including ssl options
FIX: remove duplicate line
typo
Merge pull request #28 from Binstar/feature/advanced

Added advanced config settings
ENH: updating logging docs
FIX: fully regenerate on deploy
ENH: added start script docs
ENH: removed 'boot' section as it is handled by the start script
Updated pypi.html with examples repository.
Fix incorrect path in example.
Truncated example output, moved 'installation' instructions below 'authoring'
Restore deleted content, fix link to pypi installation documentation.
Merge pull request #29 from Binstar/feature/logging-docs

Updating logging docs
Merge branch 'master' into feature/start-script

Conflicts:
	content/onsite/index.html
Merge pull request #30 from Binstar/feature/start-script

Added start script
Make formatting more consistent, add additional information about creating new packages.
Fix url