first pass at avoiding JS conflicts
ignore generated JS dir
add missing file
whoops, delete unintentional file, correct Grunt task
Merge branch 'merge-conflict-avoidance'
Update README.md
mv scss files out of docroot, rm generated .css files out of repo
add scss files to src, ignore css dir because it should only contain generated files
Merge branch 'conflict-avoidance'
add grunt-compass
add compass to grunt file
Merge branch 'grunt-compass'
rm unused
rm obsolete
rsync deploy-staging and deploy-live grunt tasks
Merge pull request #10 from Trott/grunt-rsync

rsync deploy-staging and deploy-live grunt tasks
Merge branch 'master' into android-fastclick-fix
initial changes for bower-ification
bower grunt task
grunt bower task, lib dir