Separates index.html from a custom_article.html template.

This makes it simpler to change the index.html file in a derative of the template, overriding only the index page.
add spotify to non-square icon list
Merge pull request #115 from nevillelyh/master

add spotify to non-square icon list
Merge pull request #114 from unbrice/custom_index

Separates index.html from a custom_article.html template.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	templates/includes/sidebar.html
	templates/index.html