Added conditional builder option
Remove rspec cmd from guardfile
Starting to fix tests
Versin bump