Merge pull request #1 from steveklabnik/master

Some fixes
stylistic cleanup

just lots of little minor things, some \n additions may be subjective
Merge pull request #2 from steveklabnik/stylez

stylistic cleanup
add registry