Fix validaiton of --clean

Check !== FALSE since passing --clean just sets it to NULL
Make sure we handle duplicate users properly
Import: Delete users with NULL username when passing --clean
Add @todo to handle existing categories during import
General UI Fixes

Tweaked small things here and there

added .sass-cache to .gitignore
Merge branch 'master' of https://github.com/ushahidi/Lamu

Conflicts:
	.gitignore
	modules/UshahidiUI/media/scss/modules/modals/_create-post-modal.scss
Styling Create Set Modal

Still need to work out "Set Photo" form field, but wanted to go ahead and commit and push
More Styling

This commit works with the "Add a Photo" field and the responsive design.
More Responsive Styling

tweaking the responsiveness
Merge pull request #103 from ushahidi/migration-script-fixes

Migration script fixes
Make sure import tests reset the DB before they run

Make the TaskImport2xTest extend DB testcase and add the usual dataset
Removed repeated instructions
Merge pull request #112 from ushahidi/readme

Removed repeated instructions
Create Set Modal Styles

This is a first draft of the create set modal.

Subject to iteration.
Load google fonts over http/https as needed

Use // urls instead of http:// or https:// for loading google fonts
Adjusting File Structure - OOCSS & SMACSS

This commit adjusts the file and directory structure to further comply with OOCSS and SMACSS
Merge branch 'style-create-set-modal'
Fix grunt watch rules to match all scss subdirectories

Conflicts:
	modules/UshahidiUI/Gruntfile.js
Revert odd changes to views/index.php
Merge branch 'adjust-file-structure'