pulling in style fixes
Merge pull request #24 from edx/e0d/style-fixes

E0d/style fixes