After working with Solidity for a while and using javascript-mode it finally dawned on me to look for a Solidity mode and viola one exists.
Try package-list in Emacs and look for `solidity-mode'
solidity-mode 20170712.1442 installed Major mode for ethereum's solidity language
If you don't see it you will need to point to MELPA so package.el can find it. See the repo link below for more details.