Fixed one or two problems.
Merge branch 'master' of https://github.com/gilchenzion/hack-ny-fall2013