Make makefile compatible with both g++ (target: gnu) and intel (target: intel) compilers. (intel untested)
add functionality to enable/disable image creation from config file
remove square root from laser cooled ion heating timestep
add cosine trap with exponentially decaying end
Merge branch 'master' of github.com:chrisrennick/ccmd into devel

Conflicts:
	src/ccmd_main.cpp