clean up
Merge branch 'master' of http://www.github.com/sandiegodj/secret_spot