something strange
added vim session
fixed a ton of specs
fixing a hilacious merge conflict
Merge branch 'master' of github.com:dragonhoard/dragon-hoard
added in multiple emails to a customer