remove trailing whitespace
Merge branch 'feature/add_pdns_tables'
run specs with bundle exec in Guardfile

I got some errors with incompatible rspecs version.
This fixes the issues.
fix some trailing whitespaces
remove trailing whitespace
run specs with bundle exec in Guardfile

I got some errors with incompatible rspecs version.
This fixes the issues.
fix some trailing whitespaces
Merge branch 'master' of github.com:pgolm/DNSHub
fix some factory_girl issues