fixed typo in swappiness
merged swap settings
Merge pull request #426 from joshsamuelson/master

Fixing conflict