quick fix to let tubes work
Merge branch 'impliments_suggested_changes' into impliments_suggested_changes_plus_gemfile