Move everything back into root
Merge branch 'app-layout' of https://github.com/cityindex/wordpress-development-flow into app-layout

# By daithi-coombes
# Via daithi-coombes
* 'app-layout' of https://github.com/cityindex/wordpress-development-flow:
  Gemfile.lock to gitignore
  comment out dev local stackato sync
Don't ignore Gemfile.lock