Merge pull request #38 from rlconley/master

Logic for all shift types
fixed view shift type double render
Merge pull request #39 from pbyrne222/master

fixed view shift type double render
removed default shift status
Merge pull request #40 from curiousepic/master

removed default shift status
refactored sfcreate method to remove duplicative new_shift creation
fixed merge conlficts
removed deleted files from git and fixed merge conflics