Merge branch '25-fix-reservation-location' into 'master'

Resolve "Reservation-location interaction"

Closes #25 
This resolves a number of issues with _assemble_queue_data with types and methods of reservation avoidance.
It also fixes issues with reservations and --attrs location= being used together

See merge request !13