cleaned up base
Merge branch 'master' of https://github.com/c-rhodes/hack2014