coding style fixes
Merge branch 'master' of github.com:mattheu/matth.eu-starter-theme

Conflicts:
	attachment.php
Don't load video single page if post format ui functions don't exist
indenting & style