Switch File and Gemfile Update
Code Cleanup & Fix for strange Form Builder issue
Merge pull request #6 from mjp90/mp/remove_unused_files_2

Mp/remove unused files 2