updates
Merge branch 'master' of github.com:dbashford/mimosa.io
removing ds store stuff