closes #4 and #6
Merge branch 'master' of https://github.com/tommeagher/Carboy