formatting changes and switched to master branch - take 2

@ascott1 I followed your instructions to fix my repo, it looks like we're ok now, thanks!