- introduce compass + foundation
- remove specific version of rspec-rails to make it more compatible on
  Windows
	app/old_assets/
Adding default titles to the views.  Definately room for improvement to titles
- remove unused call to foundation.js
- move sass files into the sass folder
- remove app.css and normalize.css since they are generated
Merge branch 'master' into setup_compass

* master:
  - move sass files into the sass folder - remove app.css and normalize.css since they are generated
  - remove unused call to foundation.js
  Adding default titles to the views.  Definately room for improvement to titles
  - remove specific version of rspec-rails to make it more compatible on   Windows 	app/old_assets/
  - introduce compass + foundation

Conflicts:
	.gitignore
	Gemfile.lock
	app/assets/sass/_settings.scss
	app/assets/sass/common.scss
	app/assets/sass/site_nav.scss
	app/assets/stylesheets/application.scss
	app/assets/stylesheets/conf/_settings.css.scss
	app/assets/stylesheets/foundation_and_overrides.scss
	app/assets/stylesheets/site_nav.scss
	app/assets/stylesheets/widgets/site_nav.scss
	app/views/layouts/application.html.erb