basic style
Merge pull request #24 from cgzones/style-guide

basic style
Merge pull request #26 from ddpbsd/master

Fix issue #25 and post 2.7 "whats new" items
Merge remote-tracking branch 'upstream/master'