First pass at copy edits
Rolled back bower.json change
Rolled back bower.json change
merge