Indented aside tag within conditional

Just noticed this wasn't indented like the rest. :)
Comment config.php excerpt length is in words

Add comment to POST_EXCERPT_LENGTH to indicate it is in words, not
characters.
Update comment per swalkinshaw's suggestion
Merge pull request #868 from jmjf/comment--specify-excerpt-length-unit

Comment config.php excerpt length is in words
Merge pull request #863 from patrickocoffeyo/master

Indented aside tag within conditional
Adding the ReduxFramework
Integration of ReduxFramework - First pass
Update versions
Close #853 - Add Romanian translation by @AlexAlexandru
Latest build
Integration of ReduxFramework - 2nd pass
Make sure jQuery fallback is immediately after jQuery
Updated alerts to bootstrap v3
Merge pull request #872 from weslly/update-bs-alerts

Updated alert boxes to bootstrap v3
Close #842 - Move version task to a grunt plugin
Merge branch 'redux-framework'
Merge branch 'master' of https://github.com/roots/roots into roots-master

Conflicts:
	base.php
	index.php
	lib/config.php
	lib/scripts.php
syncing shoestrap with roots