codekit config update
model and controllers updated
codekit config added to gitignore
dev -> master merge