merging master changes for directory restructure
trying to get application.css working correctly