Updates from Yesterday

Styles
Merge branch 'master' of https://github.com/NateFlynn/ace