major updates

including font-awesome 3.0
no vim swp files