Revert "Revert "Upgraded Octopress""

This reverts commit 1899f8b1cca48eea29d23f64a6b9bcf858b851a6.

Conflicts:
	.gitignore
Reworded AEM Dependency Finder
Revert "Revert "Revert "Upgraded Octopress"""

This reverts commit 273afd7f6b3e3364fe4bc4b67b816e62cf8a87c3.