Revert "Merge branch 'messedupstaticfiles'"

This reverts commit 076995ae8fdf3ad37d1e9734cd2185499c32db6a, reversing
changes made to 604aef687c56bccc1c904dc321e5524d45de0de8.
development connecting to live stuff