Fix fo bug - stale data is always used, the current data in localDataSource should always be used
remove .swp files
Merge pull request #95 from bomsy/master

Fix for Bug