Use electric-indent
Merge branch 'company' of github.com:rdallasgray/graphene into company