Cleaned up a whole lot!
Merge remote-tracking branch 'origin/master'
Cleaned some little stuff up