Changing some things to be php 5.3 safe, moved to mheap's assetic package