Added settings back
Merge branch 'source' of github.com:smartmachine/smartmachine.github.io into source
Site update