Added test gems for Mac OS X and fixed base title on static page
Finish layout and routes
Merge conflict with 1588febafa commit