adding in .idea IntelliJ settings (PyCharm set these up)
one more .idea file
pycharm vagrant/virtualenv updates
More .idea updates for javascript/etc (PyCharm IDE stuff)
More .idea updates for javascript/etc (PyCharm IDE stuff)
IDE updates - tell pyCharm to parse DJango templates in a bunch of different files
merge in ftr_inellij