start merging in jareds forms to rails views
Merge branch 'develop' of github.com:sstelfox/fathomless_twilight into develop