tests might even pass in travis-ci this time! hooray phantomjs!
Merge pull request #24 from defenestrator/development-primary

tests might even pass in travis-ci this time! hooray phantomjs!