Organized dotfiles dev files
merging old master with github master