Coding conventions
Merge pull request #1203 from edx/han/apache

Coding conventions, puting spaces in front of {{ and changing ${ vars