push more; remove more; re-enable stream
Merge branch 'master' of https://github.com/jimmytheleaf/hack-for-la-2014