Removed travis button because it's included in the other PR, and
reformatted