clean up style to make the repository consistent
Merge pull request #297 from ianstormtaylor/clean/style

clean up style to make the repository consistent