Moved around some more things.
Replaced jquery-nearest that seemed to leap into a black hole.
Merge branch 'develop' into staging