Did some refactoring on forms and spec. Also rebuilt the gem file.