remove duplicate files and merge devise & custom helpers files to spec_helper
Merge branch 'master' of github.com:Tambling/whetstone