used .git/info/exclude rather than .gitignore
Merge branch 'master' of https://github.com/charlesdrews/vm-profiler

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/charlesdrews/vm-profiler