a few tweaks to accomodate port to flatiron-rails
merge with sam to include new form page
reconciled versions, have working build with all changes made