Rebased from master. Fixed all conflicts
Removing codekit crap
Ready to merge with master