getting rid of some cruft from a lingering merge
changed the gruntfile to build and ftp-deploy -- a pull of this is going to require a fresh npm install
stupid .idea file
merge