Added some more from #CodeMash
Merge branch 'master' of https://github.com/TechConf/CodeMash2014