Guardfile now calls Rakefile
Merge branch 'rake_rules'