Slight restructuring and sass file rename to work with rails-4.2

I started toying with rails-4.2 today and made a slight fix for compatibility.