Add salt fixes.
Other fixes from moving from app to website.
Merge pull request #158 from dstegelman/feature/salt

Feature/salt