squash my dirty commit
dirty commit, passing back to Koda
broken
dirty dirty dirty, rebase me
Shifts render using new datastructure sans one bug - everything is shifted by a few hours
pep8
add ability to handle overlapping shifts
Merge pull request #6 from Apogaea/piper/add_ability_to_handle_overlapping_shifts

add ability to handle overlapping shifts
fix graph to denver timezone
fix failing tests
Merging in shift refactoring