Added sublime and vim files to .gitignore and some cleanup
Fix: ccnbToXml was not synchronized properly because it was a class and not an object anymore
Merge branch 'nfn-scala-dev' into nfn_merge