merging
Merge branch 'master' of github.com:zwade/hack2014
Various changes