Merge pull request #263 from SystemDisc/master

fixed bug where passwords are stored in plaintext
Fixed typo in formatters section
Merge pull request #276 from kbjohnson90/patch-1

Fixed typo in formatters section
Merge pull request #1 from daylightstudio/master

test