Removed duplicates, fixed ordering of scripts
Merge pull request #1 from captbrogers/master

Fixed calendar