updates and fixes for several bugs
updated gems
Merge branch 'master' of git.codewranglers.org:revans/sparks
updated the gemfile for the generator template