Changed include order so more specific included files have a chance to change generic includes
Added marks/jump bash functions